CatMC-Network/PaperSpigot-Parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check for manually prefixed commands or commands that don't need a prefix for calling vanilla commands with command blocks

Browse Source
This commit is contained in:
Thinkofdeath 2014-03-23 01:29:13 +00:00
parent 09d6e4d9e1
commit 12aa3ca6ef
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
CraftBukkit-Patches/0122-Check-for-manually-prefixed-commands-or-commands-tha.patch Normal file
View File

@ -0,0 +1,29 @@
From 6683ed72e463e91b5e759902cc90dd07075479bf 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 da235e5..0b04e94 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.8.5.2.msysgit.0