diff options
author | md_5 <git@md-5.net> | 2016-11-17 12:41:03 +1100 |
---|---|---|
committer | md_5 <git@md-5.net> | 2016-11-17 12:41:03 +1100 |
commit | c25ddf063a808e3adb749e22017661f403c5fb7e (patch) | |
tree | b2efcff512be12fd3e38cf8c36386148ce6ab4ae /nms-patches/Block.patch | |
parent | 51263e97187a84338f89698eef187284055a682a (diff) | |
download | craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.tar craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.tar.gz craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.tar.lz craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.tar.xz craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.zip |
Update to Minecraft 1.11
Diffstat (limited to 'nms-patches/Block.patch')
-rw-r--r-- | nms-patches/Block.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nms-patches/Block.patch b/nms-patches/Block.patch index 3a0d2338..18446d80 100644 --- a/nms-patches/Block.patch +++ b/nms-patches/Block.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/server/Block.java +++ b/net/minecraft/server/Block.java -@@ -35,7 +35,7 @@ +@@ -37,7 +37,7 @@ private String name; public static int getId(Block block) { @@ -9,7 +9,7 @@ } public static int getCombinedId(IBlockData iblockdata) { -@@ -332,7 +332,8 @@ +@@ -334,7 +334,8 @@ int j = this.getDropCount(i, world.random); for (int k = 0; k < j; ++k) { @@ -18,8 +18,8 @@ + if (world.random.nextFloat() < f) { Item item = this.getDropType(iblockdata, world.random, i); - if (item != null) { -@@ -873,7 +874,7 @@ + if (item != Items.a) { +@@ -896,7 +897,7 @@ if (hashset.contains(block16)) { for (int i = 0; i < 15; ++i) { @@ -28,16 +28,16 @@ Block.REGISTRY_ID.a(block16.fromLegacyData(i), j); } -@@ -882,7 +883,7 @@ +@@ -905,7 +906,7 @@ - while (iterator2.hasNext()) { - IBlockData iblockdata = (IBlockData) iterator2.next(); + while (unmodifiableiterator.hasNext()) { + IBlockData iblockdata = (IBlockData) unmodifiableiterator.next(); - int k = Block.REGISTRY.a((Object) block16) << 4 | block16.toLegacyData(iblockdata); + int k = Block.REGISTRY.a(block16) << 4 | block16.toLegacyData(iblockdata); // CraftBukkit - decompile error Block.REGISTRY_ID.a(iblockdata, k); } -@@ -891,6 +892,12 @@ +@@ -914,6 +915,12 @@ } |