fix: injector disconnect for 1.21 and above

dmulloy2 · Jun 15, 2024 · 5cb6b81 · 5cb6b81
1 parent b75bba8
commit 5cb6b81
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 8 deletions.
diff --git a/src/main/java/com/comphenix/protocol/injector/netty/channel/NettyChannelInjector.java b/src/main/java/com/comphenix/protocol/injector/netty/channel/NettyChannelInjector.java
@@ -34,6 +34,7 @@
 import com.comphenix.protocol.reflect.FuzzyReflection;
 import com.comphenix.protocol.reflect.accessors.Accessors;
 import com.comphenix.protocol.reflect.accessors.FieldAccessor;
+import com.comphenix.protocol.reflect.accessors.MethodAccessor;
 import com.comphenix.protocol.reflect.fuzzy.FuzzyFieldContract;
 import com.comphenix.protocol.utility.ByteBuddyGenerated;
 import com.comphenix.protocol.utility.MinecraftFields;
@@ -366,7 +367,15 @@ public void disconnect(String message) {
             // try to use the player connection if possible
             if (playerConnection != null) {
                 // this method prefers the main thread so no event loop here
-                MinecraftMethods.getPlayerConnectionDisconnectMethod().invoke(playerConnection, message);
+                MethodAccessor accessor = MinecraftMethods.getPlayerConnectionDisconnectMethod();
+
+                // check if the parameter is a chat component
+                if (MinecraftReflection.isIChatBaseComponent(accessor.getMethod().getParameters()[0].getClass())) {
+                    Object component = WrappedChatComponent.fromText(message).getHandle();
+                    accessor.invoke(playerConnection, component);
+                } else {
+                    accessor.invoke(playerConnection, message);
+                }
             } else {
                 Object component = WrappedChatComponent.fromText(message).getHandle();
                 MinecraftMethods.getNetworkManagerDisconnectMethod().invoke(this.networkManager, component);

diff --git a/src/main/java/com/comphenix/protocol/utility/MinecraftMethods.java b/src/main/java/com/comphenix/protocol/utility/MinecraftMethods.java
@@ -109,17 +109,26 @@ public static MethodAccessor getPlayerConnectionSendMethod() {
     public static MethodAccessor getPlayerConnectionDisconnectMethod() {
         if (playerConnectionDisconnectMethod == null) {
             FuzzyReflection playerConnectionClass = FuzzyReflection.fromClass(MinecraftReflection.getPlayerConnectionClass());
-            try {
+
+            if (MinecraftVersion.v1_21_0.atOrAbove()) {
                 playerConnectionDisconnectMethod = Accessors.getMethodAccessor(playerConnectionClass.getMethod(FuzzyMethodContract.newBuilder()
                         .returnTypeVoid()
-                        .nameRegex("disconnect.*")
                         .parameterCount(1)
-                        .parameterExactType(String.class, 0)
+                        .parameterExactType(MinecraftReflection.getIChatBaseComponentClass(), 0)
                         .build()));
-            } catch (IllegalArgumentException e) {
-                // Just assume it's the first String method
-                Method disconnect = playerConnectionClass.getMethodByParameters("disconnect", String.class);
-                playerConnectionDisconnectMethod = Accessors.getMethodAccessor(disconnect);
+            } else {
+                try {
+                    playerConnectionDisconnectMethod = Accessors.getMethodAccessor(playerConnectionClass.getMethod(FuzzyMethodContract.newBuilder()
+                            .returnTypeVoid()
+                            .nameRegex("disconnect.*")
+                            .parameterCount(1)
+                            .parameterExactType(String.class, 0)
+                            .build()));
+                } catch (IllegalArgumentException e) {
+                    // Just assume it's the first String method
+                    Method disconnect = playerConnectionClass.getMethodByParameters("disconnect", String.class);
+                    playerConnectionDisconnectMethod = Accessors.getMethodAccessor(disconnect);
+                }
             }
         }
 

diff --git a/src/main/java/com/comphenix/protocol/utility/MinecraftReflection.java b/src/main/java/com/comphenix/protocol/utility/MinecraftReflection.java
@@ -373,6 +373,11 @@ public static boolean is(Class<?> clazz, Object object) {
         if (clazz == null || object == null) {
             return false;
         }
+
+        // check for accidential class objects
+        if (object instanceof Class) {
+            return clazz.isAssignableFrom((Class<?>) object);
+        }
 
         return clazz.isAssignableFrom(object.getClass());
     }
@@ -502,6 +507,10 @@ public static boolean isCraftItemStack(Object obj) {
         return is(getCraftItemStackClass(), obj);
     }
 
+    public static boolean isIChatBaseComponent(Class<?> target) {
+        return is(getIChatBaseComponentClass(), target);
+    }
+
     /**
      * Retrieve the EntityPlayer (NMS) class.
      *