From b73cfb0f6ad4e0868475f70a2376c79f14805558 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Tue, 9 Dec 2014 14:02:30 +0000 Subject: Remove CommandWorldBorder patch as this is handled in the command wrapper --- nms-patches/CommandWorldBorder.patch | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 nms-patches/CommandWorldBorder.patch (limited to 'nms-patches') diff --git a/nms-patches/CommandWorldBorder.patch b/nms-patches/CommandWorldBorder.patch deleted file mode 100644 index dbb2dfc7..00000000 --- a/nms-patches/CommandWorldBorder.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/CommandWorldBorder.java 2014-11-29 00:40:43.197707433 +0000 -+++ src/main/java/net/minecraft/server/CommandWorldBorder.java 2014-11-29 00:40:17.000000000 +0000 -@@ -18,11 +18,11 @@ - return "commands.worldborder.usage"; - } - -- public void execute(ICommandListener icommandlistener, String[] astring) { -+ public void execute(ICommandListener icommandlistener, String[] astring) throws ExceptionUsage { // CraftBukkit - Add Exception - if (astring.length < 1) { - throw new ExceptionUsage("commands.worldborder.usage", new Object[0]); - } else { -- WorldBorder worldborder = this.d(); -+ WorldBorder worldborder = icommandlistener.getWorld().af(); // CraftBukkit - Use the world the player is in instead of the first in Minecraft - double d0; - double d1; - long i; -@@ -141,4 +141,11 @@ - public List tabComplete(ICommandListener icommandlistener, String[] astring, BlockPosition blockposition) { - return astring.length == 1 ? a(astring, new String[] { "set", "center", "damage", "warning", "add", "get"}) : (astring.length == 2 && astring[0].equals("damage") ? a(astring, new String[] { "buffer", "amount"}) : (astring.length == 2 && astring[0].equals("warning") ? a(astring, new String[] { "time", "distance"}) : null)); - } -+ -+ // CraftBukkit start - Implement compareTo since obfuscation has renamed it to a(ICommand) -+ @Override -+ public int compareTo( Object o ) { -+ return a((ICommand) o); -+ } -+ // CraftBukkit end - } -- cgit v1.2.3