summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntityOcelot.java
diff options
context:
space:
mode:
authoraPunch <alexpuncochar@yahoo.com>2012-03-05 16:32:09 -0600
committerEvilSeph <evilseph@gmail.com>2012-03-08 02:17:46 -0500
commit0ba2d285f04238572f51dee3fd33dc6d08b7f8f0 (patch)
tree5eaeeed1a7952754211aa8bb37d5b147bbbd2525 /src/main/java/net/minecraft/server/EntityOcelot.java
parent1c641ed98247f998e90e403cf951984860043430 (diff)
downloadcraftbukkit-0ba2d285f04238572f51dee3fd33dc6d08b7f8f0.tar
craftbukkit-0ba2d285f04238572f51dee3fd33dc6d08b7f8f0.tar.gz
craftbukkit-0ba2d285f04238572f51dee3fd33dc6d08b7f8f0.tar.lz
craftbukkit-0ba2d285f04238572f51dee3fd33dc6d08b7f8f0.tar.xz
craftbukkit-0ba2d285f04238572f51dee3fd33dc6d08b7f8f0.zip
[Bleeding] Made Iron Golems and Ocelots throw EntityDeathEvent. This fixes BUKKIT-1010.
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityOcelot.java')
-rw-r--r--src/main/java/net/minecraft/server/EntityOcelot.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
index cb71cfcb..0dce6fa0 100644
--- a/src/main/java/net/minecraft/server/EntityOcelot.java
+++ b/src/main/java/net/minecraft/server/EntityOcelot.java
@@ -100,7 +100,9 @@ public class EntityOcelot extends EntityTameableAnimal {
return super.damageEntity(damagesource, i);
}
- protected void dropDeathLoot(boolean flag, int i) {}
+ protected void dropDeathLoot(boolean flag, int i) {
+ super.dropDeathLoot(flag, i); // CraftBukkit - Calls EntityDeathEvent
+ }
public boolean b(EntityHuman entityhuman) {
ItemStack itemstack = entityhuman.inventory.getItemInHand();