Spigot / CraftBukkit / 3433eeadc2a

Commits

Thinkofname authored 3433eeadc2a 10 Dec 2014

Fix /gamerule always targeting the main world

Added

-+
+--- ../work/decompile-8eb82bde/net/minecraft/server/CommandGamerule.java	2014-12-10 16:21:38.404579167 +0000
-+
++++ src/main/java/net/minecraft/server/CommandGamerule.java	2014-12-10 16:18:45.268581046 +0000
-+
+@@ -19,8 +19,8 @@
-+
+         return "commands.gamerule.usage";
-+
+     }
-+
-+
+-    public void execute(ICommandListener icommandlistener, String[] astring) {
-+
+-        GameRules gamerules = this.d();
-+
++    public void execute(ICommandListener icommandlistener, String[] astring) throws CommandException { // CraftBukkit - added throws
-+
++        GameRules gamerules = icommandlistener.getWorld().getGameRules(); // Use current world
-+
+         String s = astring.length > 0 ? astring[0] : "";
-+
+         String s1 = astring.length > 1 ? a(astring, 1) : "";
-+
-+
+@@ -85,4 +85,11 @@
-+
+     private GameRules d() {
-+
+         return MinecraftServer.getServer().getWorldServer(0).getGameRules();
-+
+     }
 +
-+
++    // CraftBukkit start - fix decompile error
-+
++    @Override
-+
++    public int compareTo(Object o) {
-+
++        return a((ICommand) o);
-+
++    }
-+
++    // CraftBukkit end
-+
+ }