Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-03-12 14:50:22 +01:00
Code Issues Projects Releases Wiki Activity

Temporary workaround for exception spam

Browse Source
This commit is contained in:
fullwall 2024-06-14 16:43:31 +08:00
parent 6bcae0f7dd
commit 74df4818e4
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -253,14 +253,24 @@ public class EventListen implements Listener {
new double[] { (event.getChunk().getX() << 4) - 0.5, 0, (event.getChunk().getZ() << 4) - 0.5 }, new double[] { (event.getChunk().getX() << 4) - 0.5, 0, (event.getChunk().getZ() << 4) - 0.5 },
new double[] { (event.getChunk().getX() + 1 << 4) + 0.5, 256, new double[] { (event.getChunk().getX() + 1 << 4) + 0.5, 256,
(event.getChunk().getZ() + 1 << 4) + 0.5 })); (event.getChunk().getZ() + 1 << 4) + 0.5 }));
for (Entity entity : event.getChunk().getEntities()) { if (SUPPORTS_UNLOAD_CHUNK_ENTITIES == null) {
NPC npc = CitizensAPI.getNPCRegistry().getNPC(entity); try {
// XXX npc#isSpawned() checks valid status which is now inconsistent on chunk unload event.getChunk().getEntities();
// between different server software so check for npc.getEntity() == null instead. SUPPORTS_UNLOAD_CHUNK_ENTITIES = true;
if (npc == null || npc.getEntity() == null || toDespawn.contains(npc)) } catch (Throwable t) {
continue; SUPPORTS_UNLOAD_CHUNK_ENTITIES = false;
}
}
if (SUPPORTS_UNLOAD_CHUNK_ENTITIES) {
for (Entity entity : event.getChunk().getEntities()) {
NPC npc = CitizensAPI.getNPCRegistry().getNPC(entity);
// XXX npc#isSpawned() checks valid status which is now inconsistent on chunk unload
// between different server software so check for npc.getEntity() == null instead.
if (npc == null || npc.getEntity() == null || toDespawn.contains(npc))
continue;
toDespawn.add(npc); toDespawn.add(npc);
}
} }
if (toDespawn.isEmpty()) if (toDespawn.isEmpty())
return; return;
@ -956,4 +966,6 @@ public class EventListen implements Listener {
} }
private static boolean SUPPORT_STOP_USE_ITEM = true; private static boolean SUPPORT_STOP_USE_ITEM = true;
private static Boolean SUPPORTS_UNLOAD_CHUNK_ENTITIES;
} }