Small fix to Health trait.

DenizenScript · Mar 13, 2013 · 1a4a30a · 1a4a30a
1 parent c24fa14
commit 1a4a30a
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java
@@ -197,16 +197,18 @@ public void die()
     	// Set the player as the killer of the NPC, for listeners
     	if (player != null)
     		((CraftLivingEntity) npc.getBukkitEntity())
-    			.getHandle().killer = (EntityHuman) ((CraftLivingEntity) ((Entity) player)).getHandle();
+    			.getHandle().killer = (EntityHuman) ((CraftLivingEntity) player).getHandle();
 
     	setHealth();
+
     	EntityDeathEvent entityDeath = new EntityDeathEvent(npc.getBukkitEntity(), null);
     	NPCDeathEvent npcDeath = new NPCDeathEvent(npc, entityDeath);
 
         DenizenAPI.getCurrentInstance().getServer()
 			.getPluginManager().callEvent(npcDeath);
         DenizenAPI.getCurrentInstance().getServer()
 			.getPluginManager().callEvent(entityDeath);
+
         npc.despawn(DespawnReason.DEATH);
     }
 
@@ -222,6 +224,7 @@ public void onDeath(EntityDamageEvent event) {
             return;
 
         dying = true;
+        player = null;
 
     	String deathCause = event.getCause().toString().toLowerCase().replace('_', ' ');