Fix NPE when restarting the server when no shops exist

weaves7 · Mar 29, 2020 · 38c3d6f · 38c3d6f
1 parent ed05d88
commit 38c3d6f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/main/java/org/wargamer2010/signshop/configuration/Storage.java b/src/main/java/org/wargamer2010/signshop/configuration/Storage.java
@@ -45,6 +45,7 @@ private Storage(File ymlFile) {
         if(!ymlFile.exists()) {
             try {
                 ymlFile.createNewFile();
+                Save();
             } catch(IOException ex) {
                 SignShop.log("Could not create sellers.yml", Level.WARNING);
             }
@@ -276,11 +277,13 @@ public final void Save() {
         Map<String, Object> tempSellers = new HashMap<>();
         FileConfiguration config = new YamlConfiguration();
 
-        for(Seller seller : Storage.sellers.values()) {
-            // YML Parser really does not like dots in the name
-            String signLocation = signshopUtil.convertLocationToString(seller.getSignLocation()).replace(".", "");
+        if (sellers != null) {
+            for(Seller seller : Storage.sellers.values()) {
+                // YML Parser really does not like dots in the name
+                String signLocation = signshopUtil.convertLocationToString(seller.getSignLocation()).replace(".", "");
 
-            tempSellers.put(signLocation, seller.getSerializedData());
+                tempSellers.put(signLocation, seller.getSerializedData());
+            }
         }
 
         config.set("sellers", tempSellers);

diff --git a/src/main/java/org/wargamer2010/signshop/util/DataConverter.java b/src/main/java/org/wargamer2010/signshop/util/DataConverter.java
@@ -73,9 +73,9 @@ private static void convertData(FileConfiguration sellers) {
                     }
                     sellers.set(miscPath.toString(), newMisc);
                 }
-                sellers.set("DataVersion", SignShop.DATA_VERSION);
-                sellers.save(sellersFile);
             }
+            sellers.set("DataVersion", SignShop.DATA_VERSION);
+            sellers.save(sellersFile);
             SignShop.log("Data conversion of " + shops.size() + " shops has finished.", Level.INFO);
         } catch (IOException e) {
             SignShop.log("Error converting data!", Level.WARNING);