From 9fe552979160e7f6b0e5210896474c8f0cbc0703 Mon Sep 17 00:00:00 2001 From: Nathan Adams Date: Fri, 2 Dec 2011 00:06:27 +0000 Subject: [PATCH] Fixed ender pearls ignoring damage cancellation --- src/main/java/net/minecraft/server/EntityEnderPearl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityEnderPearl.java b/src/main/java/net/minecraft/server/EntityEnderPearl.java index 02e0327e05..5469b6e2db 100644 --- a/src/main/java/net/minecraft/server/EntityEnderPearl.java +++ b/src/main/java/net/minecraft/server/EntityEnderPearl.java @@ -42,7 +42,10 @@ public class EntityEnderPearl extends EntityProjectile { this.shooter.fallDistance = 0.0F; EntityDamageEvent event = new EntityDamageEvent(getBukkitEntity(), EntityDamageEvent.DamageCause.FALL, 5); Bukkit.getPluginManager().callEvent(event); - this.shooter.damageEntity(DamageSource.FALL, event.getDamage()); + + if (!event.isCancelled()) { + this.shooter.damageEntity(DamageSource.FALL, event.getDamage()); + } } // CraftBukkit end