From c4f5c2f7279e8d1200bd734655f2be72f8c393d2 Mon Sep 17 00:00:00 2001
From: mcmonkey4eva <mcmonkey4eva@hotmail.com>
Date: Thu, 1 Dec 2016 03:40:34 -0800
Subject: [PATCH] Correct despawn/removal order for compatibility

Version 2, the "don't include formatting fixes for some reason" edition
---
 .../main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/main/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java b/main/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java
index 35ac13d3d..cd3dd5faa 100644
--- a/main/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java
+++ b/main/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java
@@ -65,11 +65,11 @@ public class CitizensNPCRegistry implements NPCRegistry {
 
     @Override
     public void deregister(NPC npc) {
+        npc.despawn(DespawnReason.REMOVAL);
         npcs.remove(npc);
         if (saves != null) {
             saves.clearData(npc);
         }
-        npc.despawn(DespawnReason.REMOVAL);
     }
 
     @Override
@@ -77,11 +77,11 @@ public class CitizensNPCRegistry implements NPCRegistry {
         Iterator<NPC> itr = iterator();
         while (itr.hasNext()) {
             NPC npc = itr.next();
-            itr.remove();
             npc.despawn(DespawnReason.REMOVAL);
             for (Trait t : npc.getTraits()) {
                 t.onRemove();
             }
+            itr.remove();
             if (saves != null) {
                 saves.clearData(npc);
             }
@@ -255,4 +255,4 @@ public class CitizensNPCRegistry implements NPCRegistry {
         } catch (Exception e) {
         }
     }
-}
\ No newline at end of file
+}