fix: The option of Attribute Modify appears in configurations that do…

…n't contain such ability
NiFeather · Nov 20, 2024 · 0148ea8 · 0148ea8
1 parent 42843c1
commit 0148ea8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/src/main/java/xyz/nifeather/morph/abilities/options/AttributeModifyOption.java b/src/main/java/xyz/nifeather/morph/abilities/options/AttributeModifyOption.java
@@ -69,20 +69,27 @@ public ISkillOption fromMap(@Nullable Map<String, Object> map)
         var modifiers = map == null ? null : tryGet(map, "modifiers", List.class);
         var defaultInfo = new AttributeInfo();
 
-        if (modifiers != null) modifiers.forEach(o ->
+        if (modifiers != null)
         {
-            if (!(o instanceof Map<?, ?> optionMap)) return;
+            modifiers.forEach(o ->
+            {
+                if (!(o instanceof Map<?, ?> optionMap)) return;
 
-            var mmap = new Object2ObjectOpenHashMap<String, Object>();
+                var mmap = new Object2ObjectOpenHashMap<String, Object>();
 
-            optionMap.forEach((k, v) ->
-            {
-                if (!(k instanceof String kStr)) return;
-                mmap.put(kStr, v);
-            });
+                optionMap.forEach((k, v) ->
+                {
+                    if (!(k instanceof String kStr)) return;
+                    mmap.put(kStr, v);
+                });
 
-            instance.modifiers.add((AttributeInfo) defaultInfo.fromMap(mmap));
-        });
+                instance.modifiers.add((AttributeInfo) defaultInfo.fromMap(mmap));
+            });
+        }
+        else
+        {
+            return null;
+        }
 
         return instance;
     }

diff --git a/src/main/java/xyz/nifeather/morph/storage/skill/SkillsConfigurationStoreNew.java b/src/main/java/xyz/nifeather/morph/storage/skill/SkillsConfigurationStoreNew.java
@@ -62,7 +62,7 @@ private void update(int currentVersion)
 
     private void migrate_attribute()
     {
-        logger.info("Migrating attribute names...");
+        logger.info("Starting migration of attribute names...");
         var files = directoryStorage.getFiles(".*\\.json$");
 
         var abilityInstance = new AttributeModifyingAbility();