FileManager: fix load old configs

Flectone · Aug 29, 2023 · f46e3d2 · f46e3d2
1 parent e4dad19
commit f46e3d2
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/main/java/net/flectone/managers/FileManager.java b/src/main/java/net/flectone/managers/FileManager.java
@@ -89,9 +89,14 @@ private static void migrate(FYamlConfiguration fileConfiguration) {
         YamlConfiguration internalLangConfig = YamlConfiguration.loadConfiguration(defConfigStream);
 
         internalLangConfig.getKeys(true).parallelStream()
-                .filter(string -> !fileConfiguration.contains(string)
-                        || (fileConfiguration.get(string) != null
-                        &&!fileConfiguration.get(string).getClass().equals(internalLangConfig.get(string).getClass())))
+                .filter(string -> {
+                    if (!fileConfiguration.contains(string)) return true;
+
+                    Object objectA = fileConfiguration.get(string);
+                    Object objectB = internalLangConfig.get(string);
+
+                    return objectA != null && objectB != null && !objectA.getClass().equals(objectB.getClass());
+                })
                 .forEach(string -> fileConfiguration.set(string, internalLangConfig.get(string)));
 
         fileConfiguration.save();