summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorEvilSeph <evilseph@gmail.com>2014-02-11 00:36:16 -0500
committerEvilSeph <evilseph@gmail.com>2014-02-11 00:49:07 -0500
commit9131f5b55060f6751d12e587d5938794717e58c9 (patch)
tree332dadc87e189b9d9859c3402c20f4d0f454ab88 /src/main
parent776e256ff1dc45153fe39c271c11f30d03dc3d42 (diff)
downloadcraftbukkit-9131f5b55060f6751d12e587d5938794717e58c9.tar
craftbukkit-9131f5b55060f6751d12e587d5938794717e58c9.tar.gz
craftbukkit-9131f5b55060f6751d12e587d5938794717e58c9.tar.lz
craftbukkit-9131f5b55060f6751d12e587d5938794717e58c9.tar.xz
craftbukkit-9131f5b55060f6751d12e587d5938794717e58c9.zip
Ignore player selectors if not a Command Block.
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/net/minecraft/server/PlayerSelector.java6
1 files changed, 6 insertions, 0 deletions
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()) {