From 456c9bfcebe19728c8f9099fcca69192c62a639b Mon Sep 17 00:00:00 2001
From: aPunch <alexpuncochar@yahoo.com>
Date: Sat, 14 Jan 2012 17:58:47 -0600
Subject: [PATCH] call event elsewhere

---
 src/net/citizensnpcs/npc/CitizensNPC.java        | 3 +++
 src/net/citizensnpcs/npc/CitizensNPCManager.java | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/net/citizensnpcs/npc/CitizensNPC.java b/src/net/citizensnpcs/npc/CitizensNPC.java
index a28f71de6..8604550a8 100644
--- a/src/net/citizensnpcs/npc/CitizensNPC.java
+++ b/src/net/citizensnpcs/npc/CitizensNPC.java
@@ -4,6 +4,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import net.citizensnpcs.api.Citizens;
+import net.citizensnpcs.api.event.NPCDespawnEvent;
 import net.citizensnpcs.api.event.NPCSpawnEvent;
 import net.citizensnpcs.api.npc.trait.Character;
 import net.citizensnpcs.api.npc.NPC;
@@ -113,6 +114,8 @@ public class CitizensNPC implements NPC {
 
 	@Override
 	public void despawn() {
+		Bukkit.getPluginManager().callEvent(new NPCDespawnEvent(this));
+
 		mcEntity.die();
 		((CitizensNPCManager) Citizens.getNPCManager()).despawn(this);
 	}
diff --git a/src/net/citizensnpcs/npc/CitizensNPCManager.java b/src/net/citizensnpcs/npc/CitizensNPCManager.java
index 0cfced4a5..576d6cbf0 100644
--- a/src/net/citizensnpcs/npc/CitizensNPCManager.java
+++ b/src/net/citizensnpcs/npc/CitizensNPCManager.java
@@ -6,7 +6,6 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Server;
 import org.bukkit.World;
@@ -15,7 +14,6 @@ import org.bukkit.craftbukkit.CraftWorld;
 import org.bukkit.entity.LivingEntity;
 
 import net.citizensnpcs.api.Citizens;
-import net.citizensnpcs.api.event.NPCDespawnEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.npc.NPCManager;
 import net.citizensnpcs.api.npc.trait.Character;
@@ -109,8 +107,6 @@ public class CitizensNPCManager implements NPCManager {
 	}
 
 	public void despawn(NPC npc) {
-		Bukkit.getPluginManager().callEvent(new NPCDespawnEvent(npc));
-
 		CraftNPC mcEntity = ((CitizensNPC) npc).getHandle();
 		getWorldServer(((LocationTrait) npc.getTrait("location")).getLocation().getWorld()).removeEntity(mcEntity);
 		spawned.remove(mcEntity.getPlayer());