From 7986edb03df076a4b5fe71592dd7752f0a4ea6fc Mon Sep 17 00:00:00 2001 From: Jeremy Schroeder Date: Thu, 14 Mar 2013 19:55:45 -0300 Subject: [PATCH] No IDE :( --- .../denizen/scripts/containers/core/WorldScriptHelper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 4cb3281fca..e774460ec1 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 @@ -213,11 +213,11 @@ public void playerHit(EntityDamageEvent event) { @EventHandler public void playerHitByEntity(EntityDamageByEntityEvent event) { - if (CitizensAPI.getNPCRegistry().isNPC(event.getEntity() + if (CitizensAPI.getNPCRegistry().isNPC(event.getEntity()) && event.getDamager() instanceof Player) { Map context = new HashMap(); context.put("cause", event.getCause().toString()); - if (doEvent("player damages npc", CitizensAPI.getNPCRegistry.getNPC(event.getEntity(), + if (doEvent("player damages npc", CitizensAPI.getNPCRegistry.getNPC(event.getEntity()), (Player) event.getEntity(), context)) event.setCancelled(true); @@ -262,4 +262,4 @@ public void playerEat(EntityRegainHealthEvent event) { -} +}