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

Reorder npc update()

Browse Source
This commit is contained in:
fullwall 2023-02-08 21:06:10 +08:00
parent 8ba9d2ceb6
commit bbfbc767dc
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
main/src/main/java/net/citizensnpcs/EventListen.java
View File

@ -387,6 +387,7 @@ public class EventListen implements Listener {
@EventHandler(ignoreCancelled = true) @EventHandler(ignoreCancelled = true)
public void onPlayerChangedWorld(PlayerChangedWorldEvent event) { public void onPlayerChangedWorld(PlayerChangedWorldEvent event) {
skinUpdateTracker.removePlayer(event.getPlayer().getUniqueId());
if (CitizensAPI.getNPCRegistry().getNPC(event.getPlayer()) == null) if (CitizensAPI.getNPCRegistry().getNPC(event.getPlayer()) == null)
return; return;
NMS.removeFromServerPlayerList(event.getPlayer()); NMS.removeFromServerPlayerList(event.getPlayer());

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

@ -496,8 +496,6 @@ public class CitizensNPC extends AbstractNPC {
} }
} }
navigator.run();
boolean isLiving = getEntity() instanceof LivingEntity; boolean isLiving = getEntity() instanceof LivingEntity;
if (isUpdating(NPCUpdate.PACKET)) { if (isUpdating(NPCUpdate.PACKET)) {
if (data().get(NPC.Metadata.KEEP_CHUNK_LOADED, Setting.KEEP_CHUNKS_LOADED.asBoolean())) { if (data().get(NPC.Metadata.KEEP_CHUNK_LOADED, Setting.KEEP_CHUNKS_LOADED.asBoolean())) {
@ -536,6 +534,8 @@ public class CitizensNPC extends AbstractNPC {
} }
} }
navigator.run();
updateCounter++; updateCounter++;
} catch (Exception ex) { } catch (Exception ex) {
Throwable error = Throwables.getRootCause(ex); Throwable error = Throwables.getRootCause(ex);