From 038fceed2b38766ca2418bd533566dc360ac57e2 Mon Sep 17 00:00:00 2001 From: mcmonkey4eva Date: Fri, 30 Aug 2013 15:41:30 -0700 Subject: [PATCH] Fix error with 'entity killed' not firing (Thanks, Psychoboy!) --- .../denizen/scripts/containers/core/WorldScriptHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java index 8fe6bb116a..930fa50aca 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java @@ -587,8 +587,8 @@ else if (entity.isPlayer()) { context.put("damage", new Element(event.getDamage())); context.put("cause", new Element(event.getCause().name())); - if (entity instanceof LivingEntity) { - if (event.getDamage() >= ((LivingEntity) entity).getHealth()) { + if (entity.getLivingEntity() != null) { + if (event.getDamage() >= entity.getLivingEntity().getHealth()) { isFatal = true; } }