PaperMC/CraftBukkit-Patches/0109-Check-for-manually-prefixed-commands-or-commands-tha.patch
Zach Brown 7b0c576798 Restructure PaperSpigot as a new set of modules
Allows us much greater control over the Spigot portion of the code
and makes us more "proper"
Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 15:46:54 -05:00

29 lines
1.3 KiB
Diff

From 3f79004c8413861b21c2d26d7eeabbe3c2025c24 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Sun, 23 Mar 2014 01:12:10 +0000
Subject: [PATCH] Check for manually prefixed commands or commands that don't
need a prefix for calling vanilla commands with command blocks
diff --git a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
index 0cd512d..278832c 100644
--- a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
+++ b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
@@ -110,6 +110,14 @@ public abstract class CommandBlockListenerAbstract implements ICommandListener {
}
}
+ // Spigot start - check for manually prefixed command or commands that don't need a prefix
+ org.bukkit.command.Command commandBlockCommand = commandMap.getCommand(args[0]);
+ if (commandBlockCommand instanceof VanillaCommandWrapper) {
+ this.b = ((VanillaCommandWrapper) commandBlockCommand).dispatchVanillaCommandBlock(this, this.e);
+ return;
+ }
+ // Spigot end
+
// Make sure this is a valid command
if (commandMap.getCommand(args[0]) == null) {
this.b = 0;
--
1.9.1