diff --git a/Changelog.txt b/Changelog.txt index 3953b678a..0c2a607a2 100644 --- a/Changelog.txt +++ b/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 diff --git a/pom.xml b/pom.xml index 079409501..cfcf23d48 100755 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.gmail.nossr50.mcMMO mcMMO - 2.1.73 + 2.1.74 mcMMO https://github.com/mcMMO-Dev/mcMMO diff --git a/src/main/java/com/gmail/nossr50/listeners/InteractionManager.java b/src/main/java/com/gmail/nossr50/listeners/InteractionManager.java index a07792a90..56cf1b5e3 100644 --- a/src/main/java/com/gmail/nossr50/listeners/InteractionManager.java +++ b/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);