Update to support new permissions...

This commit is contained in:
Gary Smoak 2011-08-16 16:50:03 -04:00
parent db6f0ad30a
commit 620fb4b9ef
2 changed files with 59 additions and 5 deletions

View file

@ -11,21 +11,25 @@ import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.net.Socket; import java.net.Socket;
import java.util.Set;
import java.util.logging.Handler; import java.util.logging.Handler;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.LogRecord; import java.util.logging.LogRecord;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.minecraft.server.ICommandListener;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.permissions.Permission;
import org.bukkit.permissions.PermissionAttachment;
import org.bukkit.permissions.PermissionAttachmentInfo;
import org.bukkit.plugin.Plugin;
import org.bukkit.util.config.ConfigurationNode; import org.bukkit.util.config.ConfigurationNode;
/** /**
* *
* @author Administrator * @author Administrator
*/ */
public class TelnetListener extends Handler implements CommandSender, ICommandListener { public class TelnetListener extends Handler implements CommandSender {
private boolean run; private boolean run;
private boolean isAuth; private boolean isAuth;
@ -235,9 +239,9 @@ public class TelnetListener extends Handler implements CommandSender, ICommandLi
if (!clientSocket.isClosed()) { if (!clientSocket.isClosed()) {
if (isRoot || allowCommand) { if (isRoot || allowCommand) {
//((CraftServer)getServer()).dispatchCommand(new ConsoleCommandSender(getServer()), command); //((CraftServer)getServer()).dispatchCommand(new ConsoleCommandSender(getServer()), command);
mcserv.issueCommand(command, this); //mcserv.issueCommand(command, this);
parent.getServer().dispatchCommand(this, command);
System.out.println("[MCTelnet] "+authUser+" issued command: " + command); System.out.println("[MCTelnet] "+authUser+" issued command: " + command);
} else { } else {
if(!command.equals("")) if(!command.equals(""))
{ {
@ -321,6 +325,8 @@ public class TelnetListener extends Handler implements CommandSender, ICommandLi
} }
public boolean isOp() { public boolean isOp() {
if(authUser.equalsIgnoreCase("console"))
return true;
if(parent.getConfiguration().getBoolean("allowOPsAll",false)) if(parent.getConfiguration().getBoolean("allowOPsAll",false))
return parent.getServer().getPlayer(authUser).isOp(); return parent.getServer().getPlayer(authUser).isOp();
return false; return false;
@ -355,4 +361,52 @@ public class TelnetListener extends Handler implements CommandSender, ICommandLi
public String getName() { public String getName() {
return authUser; return authUser;
} }
public boolean isPermissionSet(String string) {
return true;
}
public boolean isPermissionSet(Permission prmsn) {
return true;
}
public boolean hasPermission(String string) {
return true;
}
public boolean hasPermission(Permission prmsn) {
return true;
}
public PermissionAttachment addAttachment(Plugin plugin, String string, boolean bln) {
return null;
}
public PermissionAttachment addAttachment(Plugin plugin) {
return null;
}
public PermissionAttachment addAttachment(Plugin plugin, String string, boolean bln, int i) {
return null;
}
public PermissionAttachment addAttachment(Plugin plugin, int i) {
return null;
}
public void removeAttachment(PermissionAttachment pa) {
return;
}
public void recalculatePermissions() {
return;
}
public Set<PermissionAttachmentInfo> getEffectivePermissions() {
return null;
}
public void setOp(boolean bln) {
return;
}
} }

View file

@ -1,6 +1,6 @@
name: MCTelnet name: MCTelnet
main: com.bekvon.bukkit.mctelnet.MCTelnet main: com.bekvon.bukkit.mctelnet.MCTelnet
version: 1.2.5 version: 1.2.6
description: Telnet console access plugin. description: Telnet console access plugin.
author: bekvon author: bekvon
commands: commands: