diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-12-02 20:24:03 +0000 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-12-02 20:24:03 +0000 |
| commit | 2422099346777b0c5ba4cf086d8cac24f9238b97 (patch) | |
| tree | 28df1bb9d22293ab4a38d33e06a030809689ef49 /nms-patches/CommandBlockListenerAbstract.patch | |
| parent | 3c4a02ed339a4850b1cad469cf494fa187ee6b86 (diff) | |
| download | craftbukkit-2422099346777b0c5ba4cf086d8cac24f9238b97.tar craftbukkit-2422099346777b0c5ba4cf086d8cac24f9238b97.tar.gz craftbukkit-2422099346777b0c5ba4cf086d8cac24f9238b97.tar.lz craftbukkit-2422099346777b0c5ba4cf086d8cac24f9238b97.tar.xz craftbukkit-2422099346777b0c5ba4cf086d8cac24f9238b97.zip | |
Fix selectors in non-bukkit commands for command blocks
Diffstat (limited to 'nms-patches/CommandBlockListenerAbstract.patch')
| -rw-r--r-- | nms-patches/CommandBlockListenerAbstract.patch | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nms-patches/CommandBlockListenerAbstract.patch b/nms-patches/CommandBlockListenerAbstract.patch index 0bad2a43..aacf5ff8 100644 --- a/nms-patches/CommandBlockListenerAbstract.patch +++ b/nms-patches/CommandBlockListenerAbstract.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/CommandBlockListenerAbstract.java 2014-11-28 20:19:48.021499587 +0000 -+++ src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java 2014-11-28 20:18:58.289500691 +0000 +--- ../work/decompile-8eb82bde//net/minecraft/server/CommandBlockListenerAbstract.java 2014-12-02 20:23:51.921621335 +0000 ++++ src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java 2014-12-02 20:23:10.809622247 +0000 @@ -4,6 +4,13 @@ import java.util.Date; import java.util.concurrent.Callable; @@ -134,7 +134,7 @@ } catch (Throwable throwable) { CrashReport crashreport = CrashReport.a(throwable, "Executing command block"); CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Command to be executed"); -@@ -91,8 +202,26 @@ +@@ -91,8 +202,27 @@ } else { this.b = 0; } @@ -143,7 +143,8 @@ + // CraftBukkit start + private ArrayList<String[]> buildCommands(String[] args, int pos) { + ArrayList<String[]> commands = new ArrayList<String[]>(); -+ EntityPlayer[] players = ((java.util.List<EntityPlayer>)PlayerSelector.getPlayers(this, args[pos], EntityPlayer.class)).toArray(new EntityPlayer[0]); ++ java.util.List<EntityPlayer> players = (java.util.List<EntityPlayer>)PlayerSelector.getPlayers(this, args[pos], EntityPlayer.class); ++ + if (players != null) { + for (EntityPlayer player : players) { + if (player.world != this.getWorld()) { |