diff options
Diffstat (limited to 'nms-patches/Block.patch')
| -rw-r--r-- | nms-patches/Block.patch | 41 |
1 files changed, 35 insertions, 6 deletions
diff --git a/nms-patches/Block.patch b/nms-patches/Block.patch index 360a2c0b..4980705c 100644 --- a/nms-patches/Block.patch +++ b/nms-patches/Block.patch @@ -1,6 +1,15 @@ --- a/net/minecraft/server/Block.java +++ b/net/minecraft/server/Block.java -@@ -336,7 +336,8 @@ +@@ -34,7 +34,7 @@ + private String name; + + public static int getId(Block block) { +- return Block.REGISTRY.a((Object) block); ++ return Block.REGISTRY.a(block); // CraftBukkit - decompile error + } + + public static int getCombinedId(IBlockData iblockdata) { +@@ -301,7 +301,8 @@ int j = this.getDropCount(i, world.random); for (int k = 0; k < j; ++k) { @@ -10,14 +19,34 @@ Item item = this.getDropType(iblockdata, world.random, i); if (item != null) { -@@ -1002,4 +1003,10 @@ - return this.getBreakSound(); - } +@@ -825,7 +826,7 @@ + + if (hashset.contains(block16)) { + for (int i = 0; i < 15; ++i) { +- int j = Block.REGISTRY.a((Object) block16) << 4 | i; ++ int j = Block.REGISTRY.a(block16) << 4 | i; // CraftBukkit - decompile error + + Block.REGISTRY_ID.a(block16.fromLegacyData(i), j); + } +@@ -834,7 +835,7 @@ + + while (iterator2.hasNext()) { + IBlockData iblockdata = (IBlockData) iterator2.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); + } +@@ -843,6 +844,12 @@ + } -+ + + // CraftBukkit start + public int getExpDrop(World world, IBlockData data, int enchantmentLevel) { + return 0; + } + // CraftBukkit end - } ++ + private static void a(int i, MinecraftKey minecraftkey, Block block) { + Block.REGISTRY.a(i, minecraftkey, block); + } |