Validate state

CitizensDev · Jan 17, 2019 · 5447561 · 5447561
1 parent 71b8744
commit 5447561
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/Citizens.java b/main/src/main/java/net/citizensnpcs/Citizens.java
@@ -381,9 +381,14 @@ public void run() {
 
     @Override
     public void setDefaultNPCDataStore(NPCDataStore store) {
-        saves.storeAll(npcRegistry);
-        saves.saveToDiskImmediate();
-        despawnNPCs();
+        if (store == null) {
+            throw new IllegalArgumentException("must be non-null");
+        }
+        if (saves != null) {
+            saves.storeAll(npcRegistry);
+            saves.saveToDiskImmediate();
+            despawnNPCs();
+        }
         this.saves = store;
         this.npcRegistry = new CitizensNPCRegistry(saves);
     }