diff options
Diffstat (limited to 'nms-patches/EntityFallingBlock.patch')
| -rw-r--r-- | nms-patches/EntityFallingBlock.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nms-patches/EntityFallingBlock.patch b/nms-patches/EntityFallingBlock.patch index c43f5e4f..9780f6c0 100644 --- a/nms-patches/EntityFallingBlock.patch +++ b/nms-patches/EntityFallingBlock.patch @@ -9,7 +9,7 @@ public class EntityFallingBlock extends Entity { private IBlockData block; -@@ -65,7 +67,7 @@ +@@ -69,7 +71,7 @@ if (this.ticksLived++ == 0) { blockposition = new BlockPosition(this); @@ -18,31 +18,31 @@ this.world.setAir(blockposition); } else if (!this.world.isClientSide) { this.die(); -@@ -88,7 +90,7 @@ +@@ -110,7 +112,7 @@ - if (BlockFalling.i(this.world.getType(new BlockPosition(this.locX, this.locY - 0.009999999776482582D, this.locZ)))) { + if (!flag1 && BlockFalling.i(this.world.getType(new BlockPosition(this.locX, this.locY - 0.009999999776482582D, this.locZ)))) { this.onGround = false; - return; + // return; // CraftBukkit } this.motX *= 0.699999988079071D; -@@ -97,7 +99,13 @@ +@@ -119,7 +121,13 @@ if (iblockdata.getBlock() != Blocks.PISTON_EXTENSION) { this.die(); if (!this.f) { -- if (this.world.a(block, blockposition, true, EnumDirection.UP, (Entity) null) && !BlockFalling.i(this.world.getType(blockposition.down())) && this.world.setTypeAndData(blockposition, this.block, 3)) { +- if (this.world.a(block, blockposition, true, EnumDirection.UP, (Entity) null) && (flag1 || !BlockFalling.i(this.world.getType(blockposition.down()))) && this.world.setTypeAndData(blockposition, this.block, 3)) { + // CraftBukkit start -+ if (this.world.a(block, blockposition, true, EnumDirection.UP, (Entity) null) && !BlockFalling.i(this.world.getType(blockposition.down()))) { ++ if (this.world.a(block, blockposition, true, EnumDirection.UP, (Entity) null) && (flag1 || !BlockFalling.i(this.world.getType(blockposition.down())))) { + if (CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, this.block.getBlock(), this.block.getBlock().toLegacyData(this.block)).isCancelled()) { + return; + } + this.world.setTypeAndData(blockposition, this.block, 3); + // CraftBukkit end if (block instanceof BlockFalling) { - ((BlockFalling) block).a_(this.world, blockposition); + ((BlockFalling) block).a(this.world, blockposition, this.block, iblockdata); } -@@ -156,7 +164,9 @@ +@@ -175,7 +183,9 @@ while (iterator.hasNext()) { Entity entity = (Entity) iterator.next(); |