summaryrefslogtreecommitdiffstats
path: root/nms-patches/BlockCactus.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/BlockCactus.patch')
-rw-r--r--nms-patches/BlockCactus.patch4
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) {