Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-25 10:27:55 +01:00
Code Issues Projects Releases Wiki Activity

Fixed ender pearls ignoring damage cancellation

Browse Source
This commit is contained in:
Nathan Adams 2011-12-02 00:06:27 +00:00
parent 0c958c0dff
commit 9fe5529791
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/minecraft/server/EntityEnderPearl.java
View File

@ -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