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

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) {

nms-patches/BlockMagma.patch

@@ -1,10 +1,12 @@
 --- a/net/minecraft/server/BlockMagma.java
 +++ b/net/minecraft/server/BlockMagma.java
-@@ -17,6 +17,7 @@
+@@ -17,7 +17,9 @@
  
      public void stepOn(World world, BlockPosition blockposition, Entity entity) {
          if (!entity.isFireProof() && entity instanceof EntityLiving && !EnchantmentManager.j((EntityLiving) entity)) {
 +            org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()); // CraftBukkit
              entity.damageEntity(DamageSource.HOT_FLOOR, 1.0F);
++            org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = null; // CraftBukkit
          }
  
+         super.stepOn(world, blockposition, entity);