add world event on player damaged by npc (with <context.damager> cont…

…aining the NPCID of the NPC attacking)
DenizenScript · Mar 14, 2013 · 034aa61 · 034aa61
1 parent 1ff3562
commit 034aa61
Showing 1 changed file with 6 additions and 1 deletion.
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
@@ -221,7 +221,12 @@ public void playerHitByEntity(EntityDamageByEntityEvent event) {
             if (doEvent("player damaged by entity", null, (Player) event.getEntity(), context))
                 event.setCancelled(true);
 
-            if (event.getDamager() instanceof Player) {
+            if (CitizensAPI.getNPCRegistry().isNPC(event.getDamager())) {
+                context.put("damager", String.valueOf(CitizensAPI.getNPCRegistry().getNPC(event.getDamager()).getId()));
+                if (doEvent("player damaged by npc", null, (Player) event.getEntity(), context))
+                    event.setCancelled(true);
+
+            } else if (event.getDamager() instanceof Player) {
                 context.put("damager", ((Player) event.getDamager()).getName());
                 if (doEvent("player damaged by player", null, (Player) event.getEntity(), context))
                     event.setCancelled(true);