Fix #296 (#297)

* ModuleManager safety * Module wasn't spelled correctly, causing NPE.
kami-blue · Dec 18, 2019 · 27dda1b · 27dda1b
1 parent 52af5bb
commit 27dda1b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/me/zeroeightsix/kami/mixin/client/MixinC00Handshake.java b/src/main/java/me/zeroeightsix/kami/mixin/client/MixinC00Handshake.java
@@ -27,7 +27,7 @@ public class MixinC00Handshake {
 
     @Inject(method = "writePacketData", at = @At(value = "HEAD"), cancellable = true)
     public void writePacketData(PacketBuffer buf, CallbackInfo info) {
-        if (ModuleManager.isModuleEnabled("FakeVanilla")) {
+        if (ModuleManager.isModuleEnabled("FakeVanillaClient")) {
             info.cancel();
             buf.writeVarInt(protocolVersion);
             buf.writeString(ip);

diff --git a/src/main/java/me/zeroeightsix/kami/module/ModuleManager.java b/src/main/java/me/zeroeightsix/kami/module/ModuleManager.java
@@ -119,7 +119,11 @@ public static ArrayList<Module> getModules() {
 
 
     public static Module getModuleByName(String name) {
-        return modules.get(lookup.get(name.toLowerCase()));
+        Integer index = lookup.get(name.toLowerCase());
+        if (index == null) {
+            throw new IllegalArgumentException("getModuleByName() failed. Are you calling this too early? Is the module spelled correctly? Please check!!!!");
+        }
+        return modules.get(index);
     }
 
     public static boolean isModuleEnabled(String moduleName) {