diff --git a/src/main/java/net/minecraft/server/PlayerSelector.java b/src/main/java/net/minecraft/server/PlayerSelector.java
index d98077719b..4705769da9 100644
--- a/src/main/java/net/minecraft/server/PlayerSelector.java
+++ b/src/main/java/net/minecraft/server/PlayerSelector.java
@@ -33,6 +33,12 @@ public class PlayerSelector {
     }
 
     public static EntityPlayer[] getPlayers(ICommandListener icommandlistener, String s) {
+        // CraftBukkit start
+        if (!(icommandlistener instanceof CommandBlockListenerAbstract)) {
+            return null;
+        }
+        // CraftBukkit end
+
         Matcher matcher = a.matcher(s);
 
         if (!matcher.matches()) {