Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Null check registry on disable

This commit is contained in:
fullwall 2022-03-10 03:17:27 +08:00
parent 908e678135
commit d00678b208
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/src/main/java/net/citizensnpcs/Citizens.java
View File

@ -139,11 +139,13 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
}
private void despawnNPCs(boolean save) {
for (NPCRegistry reg : Iterables.concat(Arrays.asList(npcRegistry), citizensBackedRegistries)) {
for (NPCRegistry registry : Iterables.concat(Arrays.asList(npcRegistry), citizensBackedRegistries)) {
if (registry == null)
continue;
if (save) {
reg.saveToStore();
registry.saveToStore();
}
reg.despawnNPCs(DespawnReason.RELOAD);
registry.despawnNPCs(DespawnReason.RELOAD);
}
}