From 9bc3cbf4ceabe47bcfe46ab58d83e1d4609efbce Mon Sep 17 00:00:00 2001
From: simon <Anise5-humid5-Allow-5Lulu-Honk>
Date: Wed, 3 Jan 2018 19:22:45 -0500
Subject: [PATCH] Remove NPC reference to Factory on death

---
 .../src/main/java/net/simon987/npcplugin/HarvesterNPC.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/HarvesterNPC.java b/Plugin NPC/src/main/java/net/simon987/npcplugin/HarvesterNPC.java
index fc01e42..396a8e1 100644
--- a/Plugin NPC/src/main/java/net/simon987/npcplugin/HarvesterNPC.java	
+++ b/Plugin NPC/src/main/java/net/simon987/npcplugin/HarvesterNPC.java	
@@ -41,15 +41,17 @@ public class HarvesterNPC extends NonPlayerCharacter {
             //Self-destroy when age limit is reached
             if (getAge() >= NonPlayerCharacter.LIFETIME) {
                 setDead(true);
-                getFactory().getNpcs().remove(this);
             }
         }
     }
 
     @Override
     public void onDeadCallback() {
+
+        getFactory().getNpcs().remove(this);
+
         GameServer.INSTANCE.getEventDispatcher().dispatch(
-            new ObjectDeathEvent((Object)this, ID));
+                new ObjectDeathEvent(this, ID));
     }
 
     @Override