From fa83b1b80c0955c083150931a47a7c6d5998319e Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 12 Jun 2016 10:13:51 +1000
Subject: SPIGOT-2388: Damage must be nulled out in some circumstances

---
 nms-patches/BlockCactus.patch | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'nms-patches/BlockCactus.patch')

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) {
-- 
cgit v1.2.3