diff options
| author | md_5 <git@md-5.net> | 2016-03-02 17:07:08 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-03-02 17:07:08 +1100 |
| commit | 2fe69605ec54d40a3d0dbf240af84ba15e555169 (patch) | |
| tree | f302793139ce68e8083b21fca6e482284d65e821 /nms-patches | |
| parent | b0411e8799585b1c8a119c5a2530e8f9b6d3e974 (diff) | |
| download | craftbukkit-2fe69605ec54d40a3d0dbf240af84ba15e555169.tar craftbukkit-2fe69605ec54d40a3d0dbf240af84ba15e555169.tar.gz craftbukkit-2fe69605ec54d40a3d0dbf240af84ba15e555169.tar.lz craftbukkit-2fe69605ec54d40a3d0dbf240af84ba15e555169.tar.xz craftbukkit-2fe69605ec54d40a3d0dbf240af84ba15e555169.zip | |
SPIGOT-1605: Fix EntityChangeBlockEvent.setCancelled(Z)V
Diffstat (limited to 'nms-patches')
| -rw-r--r-- | nms-patches/EntityFallingBlock.patch | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nms-patches/EntityFallingBlock.patch b/nms-patches/EntityFallingBlock.patch index 43f43bb5..22aa5d3a 100644 --- a/nms-patches/EntityFallingBlock.patch +++ b/nms-patches/EntityFallingBlock.patch @@ -18,11 +18,13 @@ this.world.setAir(blockposition); } else if (!this.world.isClientSide) { this.die(); -@@ -94,6 +96,12 @@ +@@ -93,7 +95,13 @@ + if (iblockdata.getBlock() != Blocks.PISTON_EXTENSION) { this.die(); if (!this.f) { - if (this.world.a(block, blockposition, true, EnumDirection.UP, (Entity) null, (ItemStack) null) && !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, (ItemStack) null) && !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, (ItemStack) null) && !BlockFalling.i(this.world.getType(blockposition.down()))) { + if (CraftEventFactory.callEntityChangeBlockEvent(this, blockposition.getX(), blockposition.getY(), blockposition.getZ(), this.block.getBlock(), this.block.getBlock().toLegacyData(this.block)).isCancelled()) { + return; + } |