Merge branch 'mcMMO-Dev:master' into update

ArmaRealms · Nov 6, 2024 · e5a8b18 · e5a8b18
2 parents e67e1a2 + 6f92baf
commit e5a8b18
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,3 +1,6 @@
+Version 2.2.025
+    Fixed NullPointerException spam when processing XP for child skills
+
 Version 2.2.024
     Fixed errors when Fishing or using Shake ability
     Significant optimizations made to reading new chunks for mcMMO

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.2.024</version>
+    <version>2.2.025</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>

diff --git a/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java b/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java
@@ -19,7 +19,6 @@
 import java.util.List;
 import java.util.Map;
 
-import static com.gmail.nossr50.util.skills.SkillTools.isChildSkill;
 import static com.gmail.nossr50.util.text.ConfigStringUtils.getConfigEntityTypeString;
 import static com.gmail.nossr50.util.text.ConfigStringUtils.getMaterialConfigString;
 
@@ -36,20 +35,16 @@ public static ExperienceConfig getInstance() {
         if (instance == null) {
             instance = new ExperienceConfig();
             for (PrimarySkillType skill : PrimarySkillType.values()) {
-                // Skip child skills
-                if (isChildSkill(skill)) {
-                    continue;
-                }
-
                 final Map<Material, Integer> experienceMap = new HashMap<>();
+                instance.blockExperienceMap.put(skill, experienceMap);
                 for (Material material : Material.values()) {
                     int xp = instance.getConfigXp(skill, material);
 
                     if (xp > 0) {
                         experienceMap.put(material, xp);
                     }
                 }
-                instance.blockExperienceMap.put(skill, experienceMap);
+
             }
         }