NPC Despawn event can fire after remove

For some stupid reason.
DenizenScript · Oct 19, 2014 · daccaa4 · daccaa4
1 parent 74a5a86
commit daccaa4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/npc/dNPCRegistry.java b/src/main/java/net/aufdemrand/denizen/npc/dNPCRegistry.java
@@ -195,9 +195,11 @@ public void despawn(NPCDespawnEvent event) {
         dNPC npc = getDenizen(event.getNPC());
 
         // Do world script event 'On NPC Despawns'
-        EventManager.doEvents(Arrays.asList("npc despawns"), npc, null, null);
+        if (npc != null)
+            EventManager.doEvents(Arrays.asList("npc despawns"), npc, null, null);
 
-        npc.action("despawn", null);
+        if (npc != null)
+            npc.action("despawn", null);
     }