mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 14:33:56 +01:00
24 lines
1.0 KiB
Diff
24 lines
1.0 KiB
Diff
--- ../work/decompile-8eb82bde//net/minecraft/server/PlayerSelector.java 2014-12-02 20:23:52.649621319 +0000
|
|
+++ src/main/java/net/minecraft/server/PlayerSelector.java 2014-12-02 20:22:46.409622789 +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, "@")) {
|
|
@@ -97,7 +102,7 @@
|
|
if (h(map)) {
|
|
arraylist.add(icommandlistener.getWorld());
|
|
} else {
|
|
- Collections.addAll(arraylist, MinecraftServer.getServer().worldServer);
|
|
+ arraylist.addAll(MinecraftServer.getServer().worlds); // CraftBukkit
|
|
}
|
|
|
|
return arraylist;
|