OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-18 11:22:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-449: Fix the wrong caller being used in chain execute commands

Browse source
This commit is contained in:
Thinkofdeath 2015-01-25 15:17:48 +00:00
parent 4b6df5adfe
commit 15e81cf551
3 changed files with 30 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nms-patches/CommandBlockListenerAbstract.patch
View file

@ -1,5 +1,5 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/CommandBlockListenerAbstract.java 2014-12-27 14:58:24.901254690 +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 2014-12-27 14:58:24.905254690 +0000 +++ src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java 2015-01-25 15:16:21.156837700 +0000
@@ -4,6 +4,13 @@ @@ -4,6 +4,13 @@
import java.util.Date; import java.util.Date;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
@ -82,7 +82,7 @@
+ if (!((VanillaCommandWrapper) commandBlockCommand).testPermission(bSender)) { + if (!((VanillaCommandWrapper) commandBlockCommand).testPermission(bSender)) {
+ return 0; + return 0;
+ } + }
+ return ((VanillaCommandWrapper) commandBlockCommand).dispatchVanillaCommand(sender, as); + return ((VanillaCommandWrapper) commandBlockCommand).dispatchVanillaCommand(bSender, sender, as);
+ } + }
+ +
+ // Make sure this is a valid command + // Make sure this is a valid command

23
nms-patches/CommandExecute.patch
View file

@ -1,14 +1,17 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/CommandExecute.java 2015-01-04 23:24:40.781538505 +0000 --- ../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-04 23:24:40.781538505 +0000 +++ src/main/java/net/minecraft/server/CommandExecute.java 2015-01-25 15:16:56.720837314 +0000
@@ -2,6 +2,7 @@ @@ -2,6 +2,10 @@
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
+// CraftBukkit start
+import org.bukkit.craftbukkit.command.ProxiedNativeCommandSender; +import org.bukkit.craftbukkit.command.ProxiedNativeCommandSender;
+import org.bukkit.craftbukkit.command.VanillaCommandWrapper;
+// CraftBukkit end
public class CommandExecute extends CommandAbstract { public class CommandExecute extends CommandAbstract {
@@ -19,7 +20,7 @@ @@ -19,7 +23,7 @@
return "commands.execute.usage"; return "commands.execute.usage";
} }
@ -17,7 +20,7 @@
if (astring.length < 5) { if (astring.length < 5) {
throw new ExceptionUsage("commands.execute.usage", new Object[0]); throw new ExceptionUsage("commands.execute.usage", new Object[0]);
} else { } else {
@@ -52,12 +53,28 @@ @@ -52,12 +56,30 @@
ICommandHandler icommandhandler = MinecraftServer.getServer().getCommandHandler(); ICommandHandler icommandhandler = MinecraftServer.getServer().getCommandHandler();
try { try {
@ -25,12 +28,14 @@
- -
+ // CraftBukkit start + // CraftBukkit start
+ org.bukkit.command.CommandSender sender = null; + org.bukkit.command.CommandSender sender = null;
+ if (icommandlistener.f() != null) { + if (icommandlistener instanceof DedicatedServer) {
+ sender = icommandlistener.f().getBukkitEntity();
+ } else if (icommandlistener instanceof DedicatedServer) {
+ sender = MinecraftServer.getServer().server.getConsoleSender(); + sender = MinecraftServer.getServer().server.getConsoleSender();
+ } else if (icommandlistener instanceof TileEntityCommandListener) { + } else if (icommandlistener instanceof TileEntityCommandListener) {
+ sender = ((TileEntityCommandListener) icommandlistener).sender; + sender = ((TileEntityCommandListener) icommandlistener).sender;
+ } else if (VanillaCommandWrapper.lastSender != null) {
+ sender = VanillaCommandWrapper.lastSender;
+ }else if (icommandlistener.f() != null) {
+ sender = icommandlistener.f().getBukkitEntity();
+ } else { + } else {
+ throw new CommandException("Unhandled executor " + icommandlistener.getClass().getSimpleName(), new Object[0]); + 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()}); 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) { public boolean isListStart(String[] astring, int i) {
return i == 0; return i == 0;
} }

14
src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
View file

@ -10,6 +10,7 @@ import org.apache.logging.log4j.Level;
import org.bukkit.command.BlockCommandSender; import org.bukkit.command.BlockCommandSender;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.command.ProxiedCommandSender;
import org.bukkit.command.RemoteConsoleCommandSender; import org.bukkit.command.RemoteConsoleCommandSender;
import org.bukkit.command.defaults.*; import org.bukkit.command.defaults.*;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
@ -39,7 +40,7 @@ public final class VanillaCommandWrapper extends VanillaCommand {
if (!testPermission(sender)) return true; if (!testPermission(sender)) return true;
ICommandListener icommandlistener = getListener(sender); ICommandListener icommandlistener = getListener(sender);
dispatchVanillaCommand(icommandlistener, args); dispatchVanillaCommand(sender, icommandlistener, args);
return true; return true;
} }
@ -51,7 +52,9 @@ public final class VanillaCommandWrapper extends VanillaCommand {
return (List<String>) vanillaCommand.tabComplete(getListener(sender), args, new BlockPosition(0, 0, 0)); return (List<String>) vanillaCommand.tabComplete(getListener(sender), args, new BlockPosition(0, 0, 0));
} }
public final int dispatchVanillaCommand(ICommandListener icommandlistener, String[] as) { public static CommandSender lastSender = null; // Nasty :(
public final int dispatchVanillaCommand(CommandSender bSender, ICommandListener icommandlistener, String[] as) {
// Copied from net.minecraft.server.CommandHandler // Copied from net.minecraft.server.CommandHandler
int i = getPlayerListSize(as); int i = getPlayerListSize(as);
int j = 0; int j = 0;
@ -71,6 +74,8 @@ public final class VanillaCommandWrapper extends VanillaCommand {
while (iterator.hasNext()) { while (iterator.hasNext()) {
Entity entity = iterator.next(); Entity entity = iterator.next();
CommandSender oldSender = lastSender;
lastSender = bSender;
try { try {
as[i] = entity.getUniqueID().toString(); as[i] = entity.getUniqueID().toString();
vanillaCommand.execute(icommandlistener, as); vanillaCommand.execute(icommandlistener, as);
@ -83,6 +88,8 @@ public final class VanillaCommandWrapper extends VanillaCommand {
ChatMessage chatmessage = new ChatMessage(commandexception.getMessage(), commandexception.getArgs()); ChatMessage chatmessage = new ChatMessage(commandexception.getMessage(), commandexception.getArgs());
chatmessage.getChatModifier().setColor(EnumChatFormat.RED); chatmessage.getChatModifier().setColor(EnumChatFormat.RED);
icommandlistener.sendMessage(chatmessage); icommandlistener.sendMessage(chatmessage);
} finally {
lastSender = oldSender;
} }
} }
as[i] = s2; as[i] = s2;
@ -140,6 +147,9 @@ public final class VanillaCommandWrapper extends VanillaCommand {
if (sender instanceof ConsoleCommandSender) { if (sender instanceof ConsoleCommandSender) {
return ((CraftServer) sender.getServer()).getServer(); return ((CraftServer) sender.getServer()).getServer();
} }
if (sender instanceof ProxiedCommandSender) {
return ((ProxiedNativeCommandSender) sender).getHandle();
}
return null; return null;
} }