diff options
| author | md_5 <git@md-5.net> | 2017-05-14 12:00:00 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2017-05-14 12:00:00 +1000 |
| commit | 5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5 (patch) | |
| tree | 0314ba59f51141bb5e0e7ff6ca7723d168ac94b9 /nms-patches/BlockPiston.patch | |
| parent | 6e3cec8bc78269d72ef7ef49ce82a5eadfb9615a (diff) | |
| download | craftbukkit-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/BlockPiston.patch')
| -rw-r--r-- | nms-patches/BlockPiston.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nms-patches/BlockPiston.patch b/nms-patches/BlockPiston.patch index 56b43ae9..dc294d17 100644 --- a/nms-patches/BlockPiston.patch +++ b/nms-patches/BlockPiston.patch @@ -42,12 +42,12 @@ } } -- if (!flag1 && iblockdata1.getMaterial() != Material.AIR && a(iblockdata1, world, blockposition1, enumdirection.opposite(), false) && (iblockdata1.p() == EnumPistonReaction.NORMAL || block == Blocks.PISTON || block == Blocks.STICKY_PISTON)) { -+ if (!flag1 && a(iblockdata1, world, blockposition1, enumdirection.opposite(), false) && (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.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 this.a(world, blockposition, enumdirection, false); } } else { -@@ -274,6 +298,48 @@ +@@ -277,6 +301,48 @@ int j = list.size() + list1.size(); IBlockData[] aiblockdata = new IBlockData[j]; EnumDirection enumdirection1 = flag ? enumdirection : enumdirection.opposite(); |