From 620fb4b9efb107ba610d8f1f78cb4d6746ca8be5 Mon Sep 17 00:00:00 2001
From: Gary Smoak <GSmoak@gmail.com>
Date: Tue, 16 Aug 2011 16:50:03 -0400
Subject: [PATCH] Update to support new permissions...

---
 .../bukkit/mctelnet/TelnetListener.java       | 62 +++++++++++++++++--
 src/plugin.yml                                |  2 +-
 2 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/src/com/bekvon/bukkit/mctelnet/TelnetListener.java b/src/com/bekvon/bukkit/mctelnet/TelnetListener.java
index 670c80e..30fdfdd 100644
--- a/src/com/bekvon/bukkit/mctelnet/TelnetListener.java
+++ b/src/com/bekvon/bukkit/mctelnet/TelnetListener.java
@@ -11,21 +11,25 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.net.Socket;
+import java.util.Set;
 import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
-import net.minecraft.server.ICommandListener;
 import net.minecraft.server.MinecraftServer;
 import org.bukkit.Server;
 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;
 
 /**
  *
  * @author Administrator
  */
-public class TelnetListener extends Handler implements CommandSender, ICommandListener {
+public class TelnetListener extends Handler implements CommandSender {
 
     private boolean run;
     private boolean isAuth;
@@ -235,9 +239,9 @@ public class TelnetListener extends Handler implements CommandSender, ICommandLi
                     if (!clientSocket.isClosed()) {
                         if (isRoot || allowCommand) {
                             //((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);
-                            
                         } else {
                             if(!command.equals(""))
                             {
@@ -321,6 +325,8 @@ public class TelnetListener extends Handler implements CommandSender, ICommandLi
     }
 
     public boolean isOp() {
+        if(authUser.equalsIgnoreCase("console"))
+            return true;
         if(parent.getConfiguration().getBoolean("allowOPsAll",false))
             return parent.getServer().getPlayer(authUser).isOp();
         return false;
@@ -355,4 +361,52 @@ public class TelnetListener extends Handler implements CommandSender, ICommandLi
     public String getName() {
         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;
+    }
 }
diff --git a/src/plugin.yml b/src/plugin.yml
index 7ae7ebc..eeb1577 100644
--- a/src/plugin.yml
+++ b/src/plugin.yml
@@ -1,6 +1,6 @@
 name: MCTelnet
 main: com.bekvon.bukkit.mctelnet.MCTelnet
-version: 1.2.5
+version: 1.2.6
 description: Telnet console access plugin.
 author: bekvon
 commands: