summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Ardill <andrew.ardill@gmail.com>2011-12-02 21:31:31 +1100
committerAndrew Ardill <andrew.ardill@gmail.com>2011-12-02 21:38:51 +1100
commit480376ef500a316e3d01ae554a3d071cc654d316 (patch)
tree4794cbc5339a462997fef91b986f11fb5b05f752
parentc298c104ea799e0ad3d6f8d1d560e95bb81177ac (diff)
downloadcraftbukkit-480376ef500a316e3d01ae554a3d071cc654d316.tar
craftbukkit-480376ef500a316e3d01ae554a3d071cc654d316.tar.gz
craftbukkit-480376ef500a316e3d01ae554a3d071cc654d316.tar.lz
craftbukkit-480376ef500a316e3d01ae554a3d071cc654d316.tar.xz
craftbukkit-480376ef500a316e3d01ae554a3d071cc654d316.zip
Ensure that DeathEvents are raised even for non loot-dropping living entities
Related to BUKKIT-129
-rw-r--r--src/main/java/net/minecraft/server/EntityLiving.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 3f06cd56..aa11ced1 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -624,10 +624,10 @@ public abstract class EntityLiving extends Entity {
if (k > 0) {
loot.add(new org.bukkit.inventory.ItemStack(j, k));
}
-
- CraftEventFactory.callEntityDeathEvent(this, loot);
- // CraftBukkit end
}
+
+ CraftEventFactory.callEntityDeathEvent(this, loot); // raise event even for those times when the entity does not drop loot
+ // CraftBukkit end
}
protected int e() {