diff options
| author | md_5 <git@md-5.net> | 2016-06-12 10:13:51 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-06-12 10:13:51 +1000 |
| commit | fa83b1b80c0955c083150931a47a7c6d5998319e (patch) | |
| tree | 83618ec3b166736244dff78ecb41a2ad09428b97 /nms-patches/BlockCactus.patch | |
| parent | d5ecbd0e93a7a22d3631541c258635fdcc42a489 (diff) | |
| download | craftbukkit-fa83b1b80c0955c083150931a47a7c6d5998319e.tar craftbukkit-fa83b1b80c0955c083150931a47a7c6d5998319e.tar.gz craftbukkit-fa83b1b80c0955c083150931a47a7c6d5998319e.tar.lz craftbukkit-fa83b1b80c0955c083150931a47a7c6d5998319e.tar.xz craftbukkit-fa83b1b80c0955c083150931a47a7c6d5998319e.zip | |
SPIGOT-2388: Damage must be nulled out in some circumstances
Diffstat (limited to 'nms-patches/BlockCactus.patch')
| -rw-r--r-- | nms-patches/BlockCactus.patch | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nms-patches/BlockCactus.patch b/nms-patches/BlockCactus.patch index 7c9fc0e4..951d5a9b 100644 --- a/nms-patches/BlockCactus.patch +++ b/nms-patches/BlockCactus.patch @@ -21,11 +21,13 @@ world.setTypeAndData(blockposition, iblockdata1, 4); iblockdata1.doPhysics(world, blockposition1, this); } else { -@@ -87,6 +90,7 @@ +@@ -87,7 +90,9 @@ } public void a(World world, BlockPosition blockposition, IBlockData iblockdata, Entity entity) { + CraftEventFactory.blockDamage = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()); // CraftBukkit entity.damageEntity(DamageSource.CACTUS, 1.0F); ++ CraftEventFactory.blockDamage = null; // CraftBukkit } + public IBlockData fromLegacyData(int i) { |