--- ../work/decompile-8eb82bde//net/minecraft/server/PlayerSelector.java 2014-11-28 17:43:43.337707430 +0000 +++ src/main/java/net/minecraft/server/PlayerSelector.java 2014-11-28 17:38:17.000000000 +0000 @@ -52,6 +52,11 @@ } public static List getPlayers(ICommandListener icommandlistener, String s, Class oclass) { + // CraftBukkit start - disable playerselections for ICommandListeners other than command blocks + if (!(icommandlistener instanceof CommandBlockListenerAbstract)) { + return com.google.common.collect.ImmutableList.of(); + } + // CraftBukkit end Matcher matcher = PlayerSelector.a.matcher(s); if (matcher.matches() && icommandlistener.a(1, "@")) {