Minor optimizations

ME1312 · May 19, 2021 · cfd121a · cfd121a
1 parent 3d27ddb
commit cfd121a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/src/main/java/uk/co/thinkofdeath/vanillacord/TypeChecker.java b/src/main/java/uk/co/thinkofdeath/vanillacord/TypeChecker.java
@@ -40,19 +40,21 @@ public MethodVisitor visitMethod(int access, final String name, final String des
 
             @Override
             public void visitLdcInsn(Object cst) {
-                if (secure) {
-                    if (hasTID && "Payload may not be larger than 1048576 bytes".equals(cst)) {
-                        cbQuery = fCount == 2;
-                        sbQuery = fCount == 3;
+                if (cst instanceof String) {
+                    if (secure) {
+                        if (hasTID && "Payload may not be larger than 1048576 bytes".equals(cst)) {
+                            cbQuery = fCount == 2;
+                            sbQuery = fCount == 3;
+                        }
+                    }
+                    if ("multiplayer.disconnect.outdated_server".equals(cst) || "multiplayer.disconnect.incompatible".equals(cst)) {
+                        handshakeListener = true;
+                        hsName = name;
+                        hsDesc = desc;
+                    }
+                    if ("Unexpected hello packet".equals(cst)) {
+                        loginListener = true;
                     }
-                }
-                if (cst instanceof String && (((String) cst).startsWith("multiplayer.disconnect.outdated_server") || ((String) cst).startsWith("multiplayer.disconnect.incompatible"))) {
-                    handshakeListener = true;
-                    hsName = name;
-                    hsDesc = desc;
-                }
-                if ("Unexpected hello packet".equals(cst)) {
-                    loginListener = true;
                 }
             }
         };

diff --git a/src/main/java/uk/co/thinkofdeath/vanillacord/helper/VelocityHelper.java b/src/main/java/uk/co/thinkofdeath/vanillacord/helper/VelocityHelper.java
@@ -22,7 +22,6 @@
 import static uk.co.thinkofdeath.vanillacord.helper.BungeeHelper.UUID_KEY;
 import static uk.co.thinkofdeath.vanillacord.helper.BungeeHelper.PROPERTIES_KEY;
 
-@SuppressWarnings("JavaReflectionInvocation")
 public class VelocityHelper {
 
     private static final Object NAMESPACE;
@@ -150,6 +149,7 @@ public static void completeTransaction(Object networkManager, Object loginManage
         try {
             NAMESPACE = NamespacedKey.constructor.newInstance("velocity", "player_info");
         } catch (Exception e) {
+            e.printStackTrace();
             if (e instanceof RuntimeException) {
                 throw (RuntimeException) e;
             }