Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-09 04:09:54 +01:00
Code Issues Projects Releases Wiki Activity

Don't apply fall damage when cancelled. Fixes BUKKIT-4065

Browse Source
This commit is contained in:
Travis Watkins 2013-04-13 01:03:08 -05:00
parent 8590492680
commit c3cf8a435b
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/net/minecraft/server/EntityLiving.java
View File

@ -957,11 +957,13 @@ public abstract class EntityLiving extends Entity {
// CraftBukkit start
if (i > 0) {
EntityDamageEvent event = CraftEventFactory.callEntityDamageEvent(null, this, EntityDamageEvent.DamageCause.FALL, i);
if (!event.isCancelled()) {
i = event.getDamage();
if (i > 0) {
this.getBukkitEntity().setLastDamageCause(event);
}
if (event.isCancelled()) {
return;
}
i = event.getDamage();
if (i > 0) {
this.getBukkitEntity().setLastDamageCause(event);
}
}
// CraftBukkit end