nossr50 6 years ago
parent
commit
1297b45ef8
3 changed files with 7 additions and 1 deletions
  1. 3 0
      Changelog.txt
  2. 1 1
      pom.xml
  3. 3 0
      src/main/java/com/gmail/nossr50/listeners/InteractionManager.java

+ 3 - 0
Changelog.txt

@@ -1,3 +1,6 @@
+Version 2.1.74
+    Fixed a NPE that could occur during certain events if a skill was disabled in coreskills.yml (Sorry!)
+
 Version 2.1.73
     Fixed a NPE that could occur if an entire skill was disabled in coreskills.yml
 

+ 1 - 1
pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.1.73</version>
+    <version>2.1.74</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>

+ 3 - 0
src/main/java/com/gmail/nossr50/listeners/InteractionManager.java

@@ -75,6 +75,9 @@ public class InteractionManager {
      */
     public static void processEvent(Event event, mcMMO plugin, InteractType curInteractType)
     {
+        if(interactRegister.get(curInteractType) == null)
+            return;
+
         for(Interaction interaction : interactRegister.get(curInteractType))
         {
             interaction.doInteraction(event, plugin);