Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-01-27 18:41:23 +01:00
Code Issues Projects Releases Wiki Activity

Remove entity if world failed to add

Browse Source
This commit is contained in:
fullwall 2022-06-11 12:41:24 +08:00
parent d98833ca66
commit aaf870372c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -299,10 +299,12 @@ public class CitizensNPC extends AbstractNPC {
@Override @Override
public void run() { public void run() {
if (timer++ > 10) { if (timer++ > 10) {
cancel();
Messaging.debug("Couldn't spawn", CitizensNPC.this, "entity not added to world"); Messaging.debug("Couldn't spawn", CitizensNPC.this, "entity not added to world");
entityController.remove();
cancel();
return; return;
} }
if (getEntity() == null || !getEntity().isValid()) if (getEntity() == null || !getEntity().isValid())
return; return;
@ -314,9 +316,9 @@ public class CitizensNPC extends AbstractNPC {
Bukkit.getPluginManager().callEvent(spawnEvent); Bukkit.getPluginManager().callEvent(spawnEvent);
if (spawnEvent.isCancelled()) { if (spawnEvent.isCancelled()) {
entityController.remove();
Messaging.debug("Couldn't spawn", CitizensNPC.this, "SpawnReason." + reason, Messaging.debug("Couldn't spawn", CitizensNPC.this, "SpawnReason." + reason,
"due to event cancellation."); "due to event cancellation.");
entityController.remove();
cancel(); cancel();
return; return;
} }