diff options
author | md_5 <git@md-5.net> | 2016-03-01 08:32:46 +1100 |
---|---|---|
committer | md_5 <git@md-5.net> | 2016-03-01 09:32:45 +1100 |
commit | aa008dff0f9bedbe88e1fe79831776b0a52eb90a (patch) | |
tree | cb520e0f4cc5d683fb9b7fb95de37480a7443dfb /nms-patches/CommandSpreadPlayers.patch | |
parent | e1ebe524a78e27f6a2829ed4574fded3779094e1 (diff) | |
download | craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.gz craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.lz craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.xz craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.zip |
Update to Minecraft 1.9
Diffstat (limited to 'nms-patches/CommandSpreadPlayers.patch')
-rw-r--r-- | nms-patches/CommandSpreadPlayers.patch | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/nms-patches/CommandSpreadPlayers.patch b/nms-patches/CommandSpreadPlayers.patch index 7f7a9383..03ecb614 100644 --- a/nms-patches/CommandSpreadPlayers.patch +++ b/nms-patches/CommandSpreadPlayers.patch @@ -1,7 +1,11 @@ --- a/net/minecraft/server/CommandSpreadPlayers.java +++ b/net/minecraft/server/CommandSpreadPlayers.java -@@ -237,6 +237,13 @@ - return astring.length >= 1 && astring.length <= 2 ? b(astring, 0, blockposition) : null; +@@ -235,9 +235,16 @@ + } + + public List<String> tabComplete(MinecraftServer minecraftserver, ICommandListener icommandlistener, String[] astring, BlockPosition blockposition) { +- return astring.length >= 1 && astring.length <= 2 ? b(astring, 0, blockposition) : Collections.emptyList(); ++ return astring.length >= 1 && astring.length <= 2 ? b(astring, 0, blockposition) : Collections.<String>emptyList(); // CraftBukkit - decompile error } + // CraftBukkit start - fix decompile error @@ -14,25 +18,25 @@ static class Location2D { double a; -@@ -303,7 +310,7 @@ +@@ -304,7 +311,7 @@ } blockposition = blockposition.down(); -- } while (world.getType(blockposition).getBlock().getMaterial() == Material.AIR); -+ } while (getType(world, blockposition).getBlock().getMaterial() == Material.AIR); // CraftBukkit +- } while (world.getType(blockposition).getMaterial() == Material.AIR); ++ } while (getType(world, blockposition).getMaterial() == Material.AIR); // CraftBukkit return blockposition.getY() + 1; } -@@ -319,7 +326,7 @@ +@@ -320,7 +327,7 @@ } blockposition = blockposition.down(); -- material = world.getType(blockposition).getBlock().getMaterial(); -+ material = getType(world, blockposition).getBlock().getMaterial(); // CraftBukkit +- material = world.getType(blockposition).getMaterial(); ++ material = getType(world, blockposition).getMaterial(); // CraftBukkit } while (material == Material.AIR); return !material.isLiquid() && material != Material.FIRE; -@@ -329,5 +336,12 @@ +@@ -330,5 +337,12 @@ this.a = MathHelper.a(random, d0, d2); this.b = MathHelper.a(random, d1, d3); } |