Apply setLastDamageCause after processing events and the event has not been canceled. Fixes BUKKIT-1881

This allows previous causes to be available during the event, as well as making the damage cause a valid one. If EntityDamageEvent is canceled, then it's not the last DamageCause.

Also prevents setting DamageCause involuntarily through construction.

1 files changed, 3 insertions, 0 deletions

diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index ea1fd3e7..bebac89b 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -274,6 +274,7 @@ public abstract class EntityLiving extends Entity {
             this.world.getServer().getPluginManager().callEvent(event);
 
             if (!event.isCancelled()) {
+                event.getEntity().setLastDamageCause(event);
                 this.damageEntity(DamageSource.STUCK, event.getDamage());
             }
             // CraftBukkit end
@@ -301,6 +302,7 @@ public abstract class EntityLiving extends Entity {
                 this.world.getServer().getPluginManager().callEvent(event);
 
                 if (!event.isCancelled() && event.getDamage() != 0) {
+                    event.getEntity().setLastDamageCause(event);
                     this.damageEntity(DamageSource.DROWN, event.getDamage());
                 }
                 // CraftBukkit end
@@ -1362,6 +1364,7 @@ public abstract class EntityLiving extends Entity {
             return;
         }
 
+        event.getEntity().setLastDamageCause(event);
         this.damageEntity(DamageSource.OUT_OF_WORLD, event.getDamage());
         // CraftBukkit end
     }