From fef6ddc5fc0899d7b385f3b01d852b8695d019ee Mon Sep 17 00:00:00 2001
From: fullwall <fullwall@users.noreply.github.com>
Date: Tue, 25 Aug 2015 23:21:23 +0800
Subject: [PATCH] Update EventListen.java

---
 src/main/java/net/citizensnpcs/EventListen.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/citizensnpcs/EventListen.java b/src/main/java/net/citizensnpcs/EventListen.java
index e3992d7a2..cc4f64197 100644
--- a/src/main/java/net/citizensnpcs/EventListen.java
+++ b/src/main/java/net/citizensnpcs/EventListen.java
@@ -216,8 +216,8 @@ public class EventListen implements Listener {
         if (npc == null) {
             return;
         }
-        Bukkit.getPluginManager().callEvent(new NPCDeathEvent(npc, event));
         final Location location = npc.getEntity().getLocation();
+        Bukkit.getPluginManager().callEvent(new NPCDeathEvent(npc, event));
         npc.despawn(DespawnReason.DEATH);
 
         if (npc.data().has(NPC.SCOREBOARD_FAKE_TEAM_NAME_METADATA)) {
@@ -235,7 +235,7 @@ public class EventListen implements Listener {
             Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
                 @Override
                 public void run() {
-                    if (!npc.isSpawned()) {
+                    if (!npc.isSpawned() && npc.getOwningRegistry().getByUniqueId(npc.getUniqueId()) == npc) {
                         npc.spawn(location);
                     }
                 }