Avoid unclear disconnect messages when e.g. key verification failed

GeyserMC · Nov 1, 2024 · b094a1d · b094a1d
1 parent c2fd9c7
commit b094a1d
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/mod/src/main/java/org/geysermc/floodgate/mod/data/ModDataHandler.java b/mod/src/main/java/org/geysermc/floodgate/mod/data/ModDataHandler.java
@@ -90,7 +90,13 @@ private boolean checkAndHandleLogin(Object packet) {
         if (packet instanceof ServerboundHelloPacket) {
             String kickMessage = getKickMessage();
             if (kickMessage != null) {
-                networkManager.disconnect(Component.nullToEmpty(kickMessage));
+                Component message = Component.nullToEmpty(kickMessage);
+                // If possible, disconnect using the "proper" packet listener; otherwise there's no proper disconnect message
+                if (networkManager.getPacketListener() instanceof ServerLoginPacketListenerImpl loginPacketListener) {
+                    loginPacketListener.disconnect(message);
+                } else {
+                    networkManager.disconnect(message);
+                }
                 return true;
             }