diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-01-25 15:17:48 +0000 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-01-25 15:17:48 +0000 |
| commit | 15e81cf551facaee9e808b598655a6cf1274ffb1 (patch) | |
| tree | 43d4dcc4ec9c3e7747808d7e56ce874ccfbdc35a /nms-patches | |
| parent | 4b6df5adfeb92cd09428e59a963a6ee56d7d28d6 (diff) | |
| download | craftbukkit-15e81cf551facaee9e808b598655a6cf1274ffb1.tar craftbukkit-15e81cf551facaee9e808b598655a6cf1274ffb1.tar.gz craftbukkit-15e81cf551facaee9e808b598655a6cf1274ffb1.tar.lz craftbukkit-15e81cf551facaee9e808b598655a6cf1274ffb1.tar.xz craftbukkit-15e81cf551facaee9e808b598655a6cf1274ffb1.zip | |
SPIGOT-449: Fix the wrong caller being used in chain execute commands
Diffstat (limited to 'nms-patches')
| -rw-r--r-- | nms-patches/CommandBlockListenerAbstract.patch | 6 | ||||
| -rw-r--r-- | nms-patches/CommandExecute.patch | 23 |
2 files changed, 17 insertions, 12 deletions
diff --git a/nms-patches/CommandBlockListenerAbstract.patch b/nms-patches/CommandBlockListenerAbstract.patch index 9d672ec4..996b3f71 100644 --- a/nms-patches/CommandBlockListenerAbstract.patch +++ b/nms-patches/CommandBlockListenerAbstract.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/CommandBlockListenerAbstract.java 2014-12-27 14:58:24.901254690 +0000 -+++ src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java 2014-12-27 14:58:24.905254690 +0000 +--- ../work/decompile-8eb82bde//net/minecraft/server/CommandBlockListenerAbstract.java 2015-01-25 15:16:21.156837700 +0000 ++++ src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java 2015-01-25 15:16:21.156837700 +0000 @@ -4,6 +4,13 @@ import java.util.Date; import java.util.concurrent.Callable; @@ -82,7 +82,7 @@ + if (!((VanillaCommandWrapper) commandBlockCommand).testPermission(bSender)) { + return 0; + } -+ return ((VanillaCommandWrapper) commandBlockCommand).dispatchVanillaCommand(sender, as); ++ return ((VanillaCommandWrapper) commandBlockCommand).dispatchVanillaCommand(bSender, sender, as); + } + + // Make sure this is a valid command diff --git a/nms-patches/CommandExecute.patch b/nms-patches/CommandExecute.patch index 5c42ada0..a0373aa5 100644 --- a/nms-patches/CommandExecute.patch +++ b/nms-patches/CommandExecute.patch @@ -1,14 +1,17 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/CommandExecute.java 2015-01-04 23:24:40.781538505 +0000 -+++ src/main/java/net/minecraft/server/CommandExecute.java 2015-01-04 23:24:40.781538505 +0000 -@@ -2,6 +2,7 @@ +--- ../work/decompile-8eb82bde//net/minecraft/server/CommandExecute.java 2015-01-25 15:16:56.720837314 +0000 ++++ src/main/java/net/minecraft/server/CommandExecute.java 2015-01-25 15:16:56.720837314 +0000 +@@ -2,6 +2,10 @@ import java.util.Collection; import java.util.List; ++// CraftBukkit start +import org.bukkit.craftbukkit.command.ProxiedNativeCommandSender; ++import org.bukkit.craftbukkit.command.VanillaCommandWrapper; ++// CraftBukkit end public class CommandExecute extends CommandAbstract { -@@ -19,7 +20,7 @@ +@@ -19,7 +23,7 @@ return "commands.execute.usage"; } @@ -17,7 +20,7 @@ if (astring.length < 5) { throw new ExceptionUsage("commands.execute.usage", new Object[0]); } else { -@@ -52,12 +53,28 @@ +@@ -52,12 +56,30 @@ ICommandHandler icommandhandler = MinecraftServer.getServer().getCommandHandler(); try { @@ -25,12 +28,14 @@ - + // CraftBukkit start + org.bukkit.command.CommandSender sender = null; -+ if (icommandlistener.f() != null) { -+ sender = icommandlistener.f().getBukkitEntity(); -+ } else if (icommandlistener instanceof DedicatedServer) { ++ if (icommandlistener instanceof DedicatedServer) { + sender = MinecraftServer.getServer().server.getConsoleSender(); + } else if (icommandlistener instanceof TileEntityCommandListener) { + sender = ((TileEntityCommandListener) icommandlistener).sender; ++ } else if (VanillaCommandWrapper.lastSender != null) { ++ sender = VanillaCommandWrapper.lastSender; ++ }else if (icommandlistener.f() != null) { ++ sender = icommandlistener.f().getBukkitEntity(); + } else { + throw new CommandException("Unhandled executor " + icommandlistener.getClass().getSimpleName(), new Object[0]); + } @@ -48,7 +53,7 @@ throw new CommandException("commands.execute.failed", new Object[] { s, entity.getName()}); } } -@@ -70,4 +87,11 @@ +@@ -70,4 +92,11 @@ public boolean isListStart(String[] astring, int i) { return i == 0; } |