Updated commands to use CommandSender instead of Player

2 files changed, 8 insertions, 7 deletions

diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 68c9eb59..496cc6e7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1,9 +1,6 @@
 package org.bukkit.craftbukkit;
 
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandMap;
-import org.bukkit.command.SimpleCommandMap;
-import org.bukkit.command.PluginCommandYamlParser;
+import org.bukkit.command.*;
 import org.bukkit.entity.Player;
 import java.io.File;
 import java.util.ArrayList;
@@ -153,15 +150,15 @@ public final class CraftServer implements Server {
         return server;
     }
 
-    public boolean dispatchCommand(Player player, String commandLine) {
-        return commandMap.dispatch(player, commandLine);
+    public boolean dispatchCommand(CommandSender sender, String commandLine) {
+        return commandMap.dispatch(sender, commandLine);
     }
 
     public void reload() {
         PropertyManager config = new PropertyManager(console.options);
 
         console.d = config;
-        
+
         boolean animals = config.a("spawn-monsters", console.m);
         boolean monsters = config.a("spawn-monsters", console.e.k > 0);
 
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index a1ed1165..95982b65 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -25,6 +25,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         return server.getHandle().g(getName());
     }
 
+    public boolean isPlayer() {
+        return true;
+    }
+
     public boolean isOnline() {
         for (Object obj: server.getHandle().b) {
             EntityPlayerMP player = (EntityPlayerMP) obj;