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

Properly call EntityDeathEvent for mobs. Fixes BUKKIT-1519

Browse Source
This commit is contained in:
feildmaster 2012-04-15 09:16:43 -05:00
parent 6307efd2d1
commit 748ebae550
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -779,7 +779,18 @@ public abstract class EntityLiving extends Entity {
if (!this.isBaby()) { if (!this.isBaby()) {
this.dropDeathLoot(this.lastDamageByPlayerTime > 0, i); this.dropDeathLoot(this.lastDamageByPlayerTime > 0, i);
// CraftBukkit - move rare item drop call to dropDeathLoot /* CraftBukkit start - move rare item drop call to dropDeathLoot
if (this.lastDamageByPlayerTime > 0) {
int j = this.random.nextInt(200) - i;
if (j < 5) {
this.b(j <= 0 ? 1 : 0);
}
}
// */
} else {
CraftEventFactory.callEntityDeathEvent(this);
// CraftBukkit end
} }
} }

4
src/main/java/net/minecraft/server/EntityOcelot.java
View File

@ -89,7 +89,7 @@ public class EntityOcelot extends EntityTameableAnimal {
} }
protected int getLootId() { protected int getLootId() {
return 0; // CraftBukkit - Item.LEATHER.id -> 0 return Item.LEATHER.id;
} }
public boolean a(Entity entity) { public boolean a(Entity entity) {
@ -102,7 +102,7 @@ public class EntityOcelot extends EntityTameableAnimal {
} }
protected void dropDeathLoot(boolean flag, int i) { protected void dropDeathLoot(boolean flag, int i) {
super.dropDeathLoot(flag, i); // CraftBukkit - Calls EntityDeathEvent org.bukkit.craftbukkit.event.CraftEventFactory.callEntityDeathEvent(this); // CraftBukkit - Call EntityDeathEvent
} }
public boolean b(EntityHuman entityhuman) { public boolean b(EntityHuman entityhuman) {

5
src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
View File

@ -1,6 +1,7 @@
package org.bukkit.craftbukkit.event; package org.bukkit.craftbukkit.event;
import java.net.InetAddress; import java.net.InetAddress;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -287,6 +288,10 @@ public class CraftEventFactory {
return event; return event;
} }
public static EntityDeathEvent callEntityDeathEvent(EntityLiving victim) {
return callEntityDeathEvent(victim, new ArrayList<org.bukkit.inventory.ItemStack>(0));
}
public static EntityDeathEvent callEntityDeathEvent(EntityLiving victim, List<org.bukkit.inventory.ItemStack> drops) { public static EntityDeathEvent callEntityDeathEvent(EntityLiving victim, List<org.bukkit.inventory.ItemStack> drops) {
CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity(); CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity();
EntityDeathEvent event = new EntityDeathEvent(entity, drops, victim.getExpReward()); EntityDeathEvent event = new EntityDeathEvent(entity, drops, victim.getExpReward());