SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.9

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-03-01 08:32:46 +11:00
parent 2da480a9c8
commit 21d4bf5d1f
305 changed files with 6684 additions and 6105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
paper-server/nms-patches/CommandSpreadPlayers.patch
View File

@@ -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);
}