SPIGOT-2388: Damage must be nulled out in some circumstances

By: md_5 <git@md-5.net>
2016-06-12 10:13:51 +10:00
parent a9e1194e19
commit 6b0f3ef039
2 changed files with 6 additions and 2 deletions
--- a/paper-server/nms-patches/BlockCactus.patch
+++ b/paper-server/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) {