Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-12-25 10:37:35 +01:00
Code Issues Projects Releases Wiki Activity

Prevent concurrent modification issue with NPC spawning

Browse Source
This commit is contained in:
fullwall 2020-10-15 20:30:50 +08:00
parent 7dba144924
commit 8cdda471b9
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -668,21 +668,19 @@ public class EventListen implements Listener {
} }
private void respawnAllFromCoord(ChunkCoord coord, Event event) { private void respawnAllFromCoord(ChunkCoord coord, Event event) {
List<NPC> ids = toRespawn.get(coord); List<NPC> ids = Lists.newArrayList(toRespawn.get(coord));
if (ids.size() > 0) { if (ids.size() > 0) {
Messaging.debug("Respawning all NPCs at", coord, "due to", event); Messaging.debug("Respawning all NPCs at", coord, "due to", event);
} }
for (int i = 0; i < ids.size(); i++) { for (int i = 0; i < ids.size(); i++) {
NPC npc = ids.get(i); NPC npc = ids.get(i);
if (npc.getOwningRegistry().getById(npc.getId()) != npc) { if (npc.getOwningRegistry().getById(npc.getId()) != npc) {
ids.remove(i--);
if (Messaging.isDebugging()) { if (Messaging.isDebugging()) {
Messaging.debug("Prevented deregistered NPC from respawning", npc.getId()); Messaging.debug("Prevented deregistered NPC from respawning", npc.getId());
} }
continue; continue;
} }
if (npc.isSpawned()) { if (npc.isSpawned()) {
ids.remove(i--);
if (Messaging.isDebugging()) { if (Messaging.isDebugging()) {
Messaging.debug("Can't respawn NPC", npc.getId(), ": already spawned"); Messaging.debug("Can't respawn NPC", npc.getId(), ": already spawned");
} }
@ -690,23 +688,19 @@ public class EventListen implements Listener {
} }
boolean success = spawn(npc); boolean success = spawn(npc);
if (!success) { if (!success) {
ids.remove(i--);
if (Messaging.isDebugging()) { if (Messaging.isDebugging()) {
Messaging.debug("Couldn't respawn id", npc.getId(), "during", event, "at", coord); Messaging.debug("Couldn't respawn id", npc.getId(), "during", event, "at", coord);
} }
continue; continue;
} }
try {
ids.remove(i--);
} catch (IndexOutOfBoundsException ex) {
// something caused toRespawn to get modified?
Messaging.debug("Some strange chunk loading happened while spawning", npc.getId(),
" - check all your NPCs in chunk", coord, "are spawned");
break;
}
if (Messaging.isDebugging()) { if (Messaging.isDebugging()) {
Messaging.debug("Spawned id", npc.getId(), "during", event, "at", coord); Messaging.debug("Spawned id", npc.getId(), "during", event, "at", coord);
} }
} }
for (NPC npc : ids) {
toRespawn.remove(coord, npc);
}
} }
private boolean spawn(NPC npc) { private boolean spawn(NPC npc) {