2
0
nossr50 7 сар өмнө
parent
commit
6f92baf0b5

+ 3 - 0
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

+ 1 - 1
pom.xml

@@ -2,7 +2,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>

+ 2 - 7
src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java

@@ -19,7 +19,6 @@ import java.util.HashMap;
 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,12 +35,8 @@ public class ExperienceConfig extends BukkitConfig {
         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);
 
@@ -49,7 +44,7 @@ public class ExperienceConfig extends BukkitConfig {
                         experienceMap.put(material, xp);
                     }
                 }
-                instance.blockExperienceMap.put(skill, experienceMap);
+
             }
         }