summaryrefslogtreecommitdiffstats
path: root/nms-patches/Block.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2017-05-14 12:00:00 +1000
committermd_5 <git@md-5.net>2017-05-14 12:00:00 +1000
commit5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5 (patch)
tree0314ba59f51141bb5e0e7ff6ca7723d168ac94b9 /nms-patches/Block.patch
parent6e3cec8bc78269d72ef7ef49ce82a5eadfb9615a (diff)
downloadcraftbukkit-5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5.tar
craftbukkit-5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5.tar.gz
craftbukkit-5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5.tar.lz
craftbukkit-5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5.tar.xz
craftbukkit-5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5.zip
Update to Minecraft 1.12-pre2
Diffstat (limited to 'nms-patches/Block.patch')
-rw-r--r--nms-patches/Block.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/nms-patches/Block.patch b/nms-patches/Block.patch
index 18446d80..5933b92a 100644
--- a/nms-patches/Block.patch
+++ b/nms-patches/Block.patch
@@ -9,7 +9,7 @@
}
public static int getCombinedId(IBlockData iblockdata) {
-@@ -334,7 +334,8 @@
+@@ -343,7 +343,8 @@
int j = this.getDropCount(i, world.random);
for (int k = 0; k < j; ++k) {
@@ -19,7 +19,7 @@
Item item = this.getDropType(iblockdata, world.random, i);
if (item != Items.a) {
-@@ -896,7 +897,7 @@
+@@ -923,7 +924,7 @@
if (hashset.contains(block16)) {
for (int i = 0; i < 15; ++i) {
@@ -28,7 +28,7 @@
Block.REGISTRY_ID.a(block16.fromLegacyData(i), j);
}
-@@ -905,7 +906,7 @@
+@@ -932,7 +933,7 @@
while (unmodifiableiterator.hasNext()) {
IBlockData iblockdata = (IBlockData) unmodifiableiterator.next();
@@ -37,7 +37,7 @@
Block.REGISTRY_ID.a(iblockdata, k);
}
-@@ -914,6 +915,12 @@
+@@ -941,6 +942,12 @@
}