summaryrefslogtreecommitdiffstats
path: root/nms-patches/CommandBlockListenerAbstract.patch
diff options
context:
space:
mode:
authorThinkofdeath <thinkofdeath@spigotmc.org>2014-12-27 14:58:47 +0000
committerThinkofdeath <thinkofdeath@spigotmc.org>2014-12-27 14:58:47 +0000
commitc80683161952dcd465a9e9514daf488c1177b944 (patch)
treec925e8154ef0cbee69597f39ac0ad753a9c0310f /nms-patches/CommandBlockListenerAbstract.patch
parente1c64bf0ebd9ad7c4a396a97ad837288ca006954 (diff)
downloadcraftbukkit-c80683161952dcd465a9e9514daf488c1177b944.tar
craftbukkit-c80683161952dcd465a9e9514daf488c1177b944.tar.gz
craftbukkit-c80683161952dcd465a9e9514daf488c1177b944.tar.lz
craftbukkit-c80683161952dcd465a9e9514daf488c1177b944.tar.xz
craftbukkit-c80683161952dcd465a9e9514daf488c1177b944.zip
Apply permission checks to command block executed vanilla commands
Diffstat (limited to 'nms-patches/CommandBlockListenerAbstract.patch')
-rw-r--r--nms-patches/CommandBlockListenerAbstract.patch9
1 files changed, 6 insertions, 3 deletions
diff --git a/nms-patches/CommandBlockListenerAbstract.patch b/nms-patches/CommandBlockListenerAbstract.patch
index 51525923..9d672ec4 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-23 01:00:07.818620695 +0000
-+++ src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java 2014-12-23 01:00:07.818620695 +0000
+--- ../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
@@ -4,6 +4,13 @@
import java.util.Date;
import java.util.concurrent.Callable;
@@ -34,7 +34,7 @@
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.a(throwable, "Executing command block");
CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Command to be executed");
-@@ -91,8 +102,133 @@
+@@ -91,8 +102,136 @@
} else {
this.b = 0;
}
@@ -79,6 +79,9 @@
+ }
+ String as[] = command.split(" ");
+ as = VanillaCommandWrapper.dropFirstArgument(as);
++ if (!((VanillaCommandWrapper) commandBlockCommand).testPermission(bSender)) {
++ return 0;
++ }
+ return ((VanillaCommandWrapper) commandBlockCommand).dispatchVanillaCommand(sender, as);
+ }
+