summaryrefslogtreecommitdiffstats
path: root/nms-patches/BlockPiston.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2017-05-19 21:00:13 +1000
committermd_5 <git@md-5.net>2017-05-19 21:00:13 +1000
commit10043529907a4ba913ebe2712876e4b1911263b8 (patch)
tree37f3cbb2527d02eac320ed0900bf92a4f3c8407c /nms-patches/BlockPiston.patch
parent3ecbb59cbb9e20064d04628d26387742705ab9ac (diff)
downloadcraftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.tar
craftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.tar.gz
craftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.tar.lz
craftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.tar.xz
craftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.zip
Update to Minecraft 1.12-pre5
Diffstat (limited to 'nms-patches/BlockPiston.patch')
-rw-r--r--nms-patches/BlockPiston.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/nms-patches/BlockPiston.patch b/nms-patches/BlockPiston.patch
index dc294d17..c7e24f36 100644
--- a/nms-patches/BlockPiston.patch
+++ b/nms-patches/BlockPiston.patch
@@ -42,8 +42,8 @@
}
}
-- if (!flag1 && iblockdata1.getMaterial() != Material.AIR && a(iblockdata1, world, blockposition1, enumdirection.opposite(), false, enumdirection) && (iblockdata1.p() == EnumPistonReaction.NORMAL || block == Blocks.PISTON || block == Blocks.STICKY_PISTON)) {
-+ if (!flag1 && a(iblockdata1, world, blockposition1, enumdirection.opposite(), false, enumdirection) && (iblockdata1.p() == EnumPistonReaction.NORMAL || block == Blocks.PISTON || block == Blocks.STICKY_PISTON)) { // CraftBukkit - remove 'block.getMaterial() != Material.AIR' condition
+- if (!flag1 && iblockdata1.getMaterial() != Material.AIR && a(iblockdata1, world, blockposition1, enumdirection.opposite(), false, enumdirection) && (iblockdata1.o() == EnumPistonReaction.NORMAL || block == Blocks.PISTON || block == Blocks.STICKY_PISTON)) {
++ if (!flag1 && a(iblockdata1, world, blockposition1, enumdirection.opposite(), false, enumdirection) && (iblockdata1.o() == EnumPistonReaction.NORMAL || block == Blocks.PISTON || block == Blocks.STICKY_PISTON)) { // CraftBukkit - remove 'block.getMaterial() != Material.AIR' condition
this.a(world, blockposition, enumdirection, false);
}
} else {