From 9131f5b55060f6751d12e587d5938794717e58c9 Mon Sep 17 00:00:00 2001
From: EvilSeph <evilseph@gmail.com>
Date: Tue, 11 Feb 2014 00:36:16 -0500
Subject: Ignore player selectors if not a Command Block.

---
 src/main/java/net/minecraft/server/PlayerSelector.java | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/main/java/net/minecraft')

diff --git a/src/main/java/net/minecraft/server/PlayerSelector.java b/src/main/java/net/minecraft/server/PlayerSelector.java
index d9807771..4705769d 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()) {
-- 
cgit v1.2.3