Update EventListen.java

CitizensDev · Aug 25, 2015 · 0ca55e5 · 0ca55e5
1 parent 03ef04a
commit 0ca55e5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/net/citizensnpcs/EventListen.java b/src/main/java/net/citizensnpcs/EventListen.java
@@ -216,8 +216,8 @@ public void onEntityDeath(EntityDeathEvent event) {
         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 void onEntityDeath(EntityDeathEvent event) {
             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);
                     }
                 }