From a0e50c36b96b46e8187213f8ab5ff8e586720d86 Mon Sep 17 00:00:00 2001 From: GJ Date: Fri, 13 Dec 2013 12:11:30 -0500 Subject: [PATCH] [Bleeding] Fix Blazes not firing death events. Fixes BUKKIT-4898 Previously, due to the way that death events were called, Blazes only fired death events when they dropped loot. This change fixes that, enabling death events for Blazes whenever they die, regardless of loot drops. --- src/main/java/net/minecraft/server/EntityBlaze.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityBlaze.java b/src/main/java/net/minecraft/server/EntityBlaze.java index ea428c335f..fe040f4626 100644 --- a/src/main/java/net/minecraft/server/EntityBlaze.java +++ b/src/main/java/net/minecraft/server/EntityBlaze.java @@ -122,18 +122,19 @@ public class EntityBlaze extends EntityMonster { } protected void dropDeathLoot(boolean flag, int i) { + // CraftBukkit start + java.util.List loot = new java.util.ArrayList(); + if (flag) { - // CraftBukkit start - java.util.List loot = new java.util.ArrayList(); int j = this.random.nextInt(2 + i); if (j > 0) { loot.add(new org.bukkit.inventory.ItemStack(org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(Items.BLAZE_ROD), j)); } - - org.bukkit.craftbukkit.event.CraftEventFactory.callEntityDeathEvent(this, loot); - // CraftBukkit end } + + org.bukkit.craftbukkit.event.CraftEventFactory.callEntityDeathEvent(this, loot); + // CraftBukkit end } public boolean bX() {