Ignore unregistered skills when loading user file

Archy-X · Nov 15, 2023 · 6c23370 · 6c23370
1 parent 510dac2
commit 6c23370
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/common/src/main/java/dev/aurelium/auraskills/common/storage/file/FileStorageProvider.java b/common/src/main/java/dev/aurelium/auraskills/common/storage/file/FileStorageProvider.java
@@ -89,11 +89,12 @@ private SkillLevelMaps loadSkills(ConfigurationNode node) {
         // Load each skill section
         node.childrenMap().forEach((skillName, skillNode) -> {
             NamespacedId skillId = NamespacedId.fromString(skillName.toString());
-            Skill skill = plugin.getSkillRegistry().get(skillId);
-
+            Skill skill = plugin.getSkillRegistry().getOrNull(skillId);
+            if (skill == null) return;
+
             int level = skillNode.node("level").getInt();
             double xp = skillNode.node("xp").getDouble();
-            
+
             levelsMap.put(skill, level);
             xpMap.put(skill, xp);
         });
@@ -110,7 +111,8 @@ private Map<String, StatModifier> loadStatModifiers(ConfigurationNode node) {
 
             if (name != null && statName != null) {
                 NamespacedId statId = NamespacedId.fromString(statName);
-                Stat stat = plugin.getStatRegistry().get(statId);
+                Stat stat = plugin.getStatRegistry().getOrNull(statId);
+                if (stat == null) return;
 
                 StatModifier statModifier = new StatModifier(name, stat, value);
                 statModifiers.put(name, statModifier);
@@ -128,7 +130,8 @@ private Map<String, TraitModifier> loadTraitModifiers(ConfigurationNode node) {
 
             if (name != null && traitName != null) {
                 NamespacedId traitId = NamespacedId.fromString(traitName);
-                Trait trait = plugin.getTraitRegistry().get(traitId);
+                Trait trait = plugin.getTraitRegistry().getOrNull(traitId);
+                if (trait == null) return;
 
                 TraitModifier traitModifier = new TraitModifier(name, trait, value);
                 traitModifiers.put(name, traitModifier);