Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-01-08 17:38:32 +01:00
Code Issues Projects Releases Wiki Activity

Only listen to EntitiesLoad/UnloadEvent

Browse Source
This commit is contained in:
fullwall 2024-06-14 18:41:44 +08:00
parent 74df4818e4
commit 5e9f04f141
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,7 +130,7 @@ public class EventListen implements Listener {
skinUpdateTracker = new SkinUpdateTracker();
try {
Class.forName("org.bukkit.event.world.EntitiesLoadEvent");
Bukkit.getPluginManager().registerEvents(new Listener() {
Bukkit.getPluginManager().registerEvents(chunkEventListener = new Listener() {
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onEntitiesLoad(EntitiesLoadEvent event) {
loadNPCs(event);
@ -253,24 +253,14 @@ 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() + 1 << 4) + 0.5, 256,
(event.getChunk().getZ() + 1 << 4) + 0.5 }));
if (SUPPORTS_UNLOAD_CHUNK_ENTITIES == null) {
try {
event.getChunk().getEntities();
SUPPORTS_UNLOAD_CHUNK_ENTITIES = true;
} catch (Throwable t) {
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;
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())
return;
@ -966,6 +956,4 @@ public class EventListen implements Listener {
}
private static boolean SUPPORT_STOP_USE_ITEM = true;
private static Boolean SUPPORTS_UNLOAD_CHUNK_ENTITIES;
}