Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-27 21:29:14 +01:00
Code Issues Projects Releases Wiki Activity

Fix entity controller not removing properly on spawn fail

Browse Source
This commit is contained in:
fullwall 2013-01-04 16:20:13 +08:00
parent f1917117e6
commit 73b962cb20
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/citizensnpcs/npc/CitizensNPC.java
View File

@ -204,7 +204,7 @@ public class CitizensNPC extends AbstractNPC {
if (!couldSpawn) {
Messaging.debug("Retrying spawn of", getId(), "later due to chunk being unloaded.");
// we need to wait for a chunk load before trying to spawn
mcEntity = null;
entityController.remove();
EventListen.addForRespawn(at, getId());
return true;
}
@ -212,7 +212,7 @@ public class CitizensNPC extends AbstractNPC {
NPCSpawnEvent spawnEvent = new NPCSpawnEvent(this, at);
Bukkit.getPluginManager().callEvent(spawnEvent);
if (spawnEvent.isCancelled()) {
mcEntity = null;
entityController.remove();
Messaging.debug("Couldn't spawn", getId(), "due to event cancellation.");
return false;
}