Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-26 20:55:44 +01:00
Code Issues Projects Releases Wiki Activity

Fix spawn chunk NPC loading issues, fixes #1332 (#1625)

Browse Source 
Some misplaced code unintentionally caused chunks to load in the middle of the startup sequence (after NPCs refused to spawn in the chunk, but before the server was fully started), meaning any chunk that normally loads within a few seconds of startup would be loaded already at that time, meaning a chunk load event never fires, and thus any NPCs at that location simply don't spawn in until the chunk is allowed to naturally unload and is later loaded again.
This commit is contained in:
Alex "mcmonkey" Goodwin 2018-11-30 06:34:47 -08:00 committed by fullwall
parent 3ca12de138
commit 05abc9299c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,8 +221,6 @@ public class CitizensNPC extends AbstractNPC {
} }
} }
getEntity().teleport(at);
if (!couldSpawn) { if (!couldSpawn) {
Messaging.debug("Retrying spawn of", getId(), "later due to chunk being unloaded.", Messaging.debug("Retrying spawn of", getId(), "later due to chunk being unloaded.",
Util.isLoaded(at) ? "Util.isLoaded true" : "Util.isLoaded false"); Util.isLoaded(at) ? "Util.isLoaded true" : "Util.isLoaded false");
@ -232,6 +230,8 @@ public class CitizensNPC extends AbstractNPC {
return false; return false;
} }
getEntity().teleport(at);
NMS.setHeadYaw(getEntity(), at.getYaw()); NMS.setHeadYaw(getEntity(), at.getYaw());
// Set the spawned state // Set the spawned state