diff options
| author | Fabian Faßbender <fabian.fassbender42@googlemail.com> | 2014-11-29 00:38:21 +0100 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-11-29 10:57:22 +0000 |
| commit | a2c4d7e150ea295a656487062a187be07cd47677 (patch) | |
| tree | 8d65adf8e0ff04e2a494db2fe9094c26821614d3 /nms-patches | |
| parent | c61594c782c531914dfc66dbd8dcbef86b8d627b (diff) | |
| download | craftbukkit-a2c4d7e150ea295a656487062a187be07cd47677.tar craftbukkit-a2c4d7e150ea295a656487062a187be07cd47677.tar.gz craftbukkit-a2c4d7e150ea295a656487062a187be07cd47677.tar.lz craftbukkit-a2c4d7e150ea295a656487062a187be07cd47677.tar.xz craftbukkit-a2c4d7e150ea295a656487062a187be07cd47677.zip | |
Minecraft by default only uses the World at index 0 for the WorldBorder command. This fixes SPIGOT-12
Diffstat (limited to 'nms-patches')
| -rw-r--r-- | nms-patches/CommandWorldBorder.patch | 28 | ||||
| -rw-r--r-- | nms-patches/ICommand.patch | 11 |
2 files changed, 39 insertions, 0 deletions
diff --git a/nms-patches/CommandWorldBorder.patch b/nms-patches/CommandWorldBorder.patch new file mode 100644 index 00000000..dbb2dfc7 --- /dev/null +++ b/nms-patches/CommandWorldBorder.patch @@ -0,0 +1,28 @@ +--- ../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 + } diff --git a/nms-patches/ICommand.patch b/nms-patches/ICommand.patch new file mode 100644 index 00000000..f42a35f4 --- /dev/null +++ b/nms-patches/ICommand.patch @@ -0,0 +1,11 @@ +--- ../work/decompile-8eb82bde//net/minecraft/server/ICommand.java 2014-11-29 00:40:43.197707433 +0000 ++++ src/main/java/net/minecraft/server/ICommand.java 2014-11-29 00:40:17.000000000 +0000 +@@ -10,7 +10,7 @@ + + List b(); + +- void execute(ICommandListener icommandlistener, String[] astring); ++ void execute(ICommandListener icommandlistener, String[] astring) throws ExceptionUsage; // CraftBukkit - Add exception + + boolean canUse(ICommandListener icommandlistener); + |