Go away, NPE!

DenizenScript · Aug 22, 2013 · ca8b14c · ca8b14c
1 parent b7a49b0
commit ca8b14c
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/DamageTrigger.java b/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/DamageTrigger.java
@@ -36,6 +36,8 @@ else if (event.getDamager() instanceof Projectile
             dNPC npc = DenizenAPI.getDenizenNPC(CitizensAPI.getNPCRegistry().getNPC(event.getEntity()));
             if (npc == null)
                 return;
+            if (npc.getCitizen() == null)
+                return;
 
             if (!npc.getCitizen().hasTrait(TriggerTrait.class)) return;
             if (!npc.getTriggerTrait().isEnabled(name)) return;