From c5e9a169fa564f3b8119b6666f8df59d5a9b45c3 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 10 May 2016 21:47:39 +1000 Subject: Minecraft 1.9.4 --- nms-patches/CommandExecute.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'nms-patches/CommandExecute.patch') diff --git a/nms-patches/CommandExecute.patch b/nms-patches/CommandExecute.patch index 42b16464..6b7a5aab 100644 --- a/nms-patches/CommandExecute.patch +++ b/nms-patches/CommandExecute.patch @@ -1,9 +1,9 @@ --- a/net/minecraft/server/CommandExecute.java +++ b/net/minecraft/server/CommandExecute.java -@@ -3,6 +3,10 @@ - import java.util.Collection; +@@ -4,6 +4,10 @@ import java.util.Collections; import java.util.List; + import javax.annotation.Nullable; +// CraftBukkit start +import org.bukkit.craftbukkit.command.ProxiedNativeCommandSender; +import org.bukkit.craftbukkit.command.VanillaCommandWrapper; @@ -11,7 +11,7 @@ public class CommandExecute extends CommandAbstract { -@@ -49,7 +53,10 @@ +@@ -50,7 +54,10 @@ } String s = a(astring, b0); @@ -23,7 +23,7 @@ public String getName() { return entity.getName(); } -@@ -94,25 +101,57 @@ +@@ -95,25 +102,57 @@ return entity.h(); } }; @@ -67,7 +67,7 @@ } } - public List tabComplete(MinecraftServer minecraftserver, ICommandListener icommandlistener, String[] astring, BlockPosition blockposition) { + public List tabComplete(MinecraftServer minecraftserver, ICommandListener icommandlistener, String[] astring, @Nullable BlockPosition blockposition) { - return astring.length == 1 ? a(astring, minecraftserver.getPlayers()) : (astring.length > 1 && astring.length <= 4 ? a(astring, 1, blockposition) : (astring.length > 5 && astring.length <= 8 && "detect".equals(astring[4]) ? a(astring, 5, blockposition) : (astring.length == 9 && "detect".equals(astring[4]) ? a(astring, (Collection) Block.REGISTRY.keySet()) : Collections.emptyList()))); + return astring.length == 1 ? a(astring, minecraftserver.getPlayers()) : (astring.length > 1 && astring.length <= 4 ? a(astring, 1, blockposition) : (astring.length > 5 && astring.length <= 8 && "detect".equals(astring[4]) ? a(astring, 5, blockposition) : (astring.length == 9 && "detect".equals(astring[4]) ? a(astring, (Collection) Block.REGISTRY.keySet()) : Collections.emptyList()))); // CraftBukkit - decompile error } -- cgit v1.2.3