Pre-apply 'DisconnectPacket not being forwarded to a client in ConfigSessionHandler & TransitionSessionHandler'

Author: R00tB33rMan

proxy/src/main/java/com/velocitypowered/proxy/connection/backend/ConfigSessionHandler.java

@@ -254,7 +254,12 @@ public boolean handle(final FinishedUpdatePacket packet) {
 
   @Override
   public boolean handle(final DisconnectPacket packet) {
-    serverConn.disconnect();
+    MinecraftConnection playerConnection = serverConn.getPlayer().getConnection();
+    playerConnection.closeWith(DisconnectPacket.create(
+        packet.getReason().getComponent(),
+        playerConnection.getProtocolVersion(),
+        playerConnection.getState()));
+
     resultFuture.complete(ConnectionRequestResults.forDisconnect(packet, serverConn.getServer()));
     return true;
   }

proxy/src/main/java/com/velocitypowered/proxy/connection/backend/TransitionSessionHandler.java

@@ -179,15 +179,16 @@ public boolean handle(final JoinGamePacket packet) {
 
   @Override
   public boolean handle(final DisconnectPacket packet) {
-    final MinecraftConnection connection = serverConn.ensureConnected();
-    serverConn.disconnect();
+    final MinecraftConnection connection = serverConn.getPlayer().getConnection();
+    connection.closeWith(DisconnectPacket.create(
+        packet.getReason().getComponent(),
+        connection.getProtocolVersion(),
+        connection.getState()));
 
     // If we were in the middle of the Forge handshake, it is not safe to proceed. We must kick
     // the client.
-    if (connection.getType() == ConnectionTypes.LEGACY_FORGE
-        && !serverConn.getPhase().consideredComplete()) {
-      resultFuture.complete(ConnectionRequestResults.forUnsafeDisconnect(packet,
-          serverConn.getServer()));
+    if (connection.getType() == ConnectionTypes.LEGACY_FORGE && !serverConn.getPhase().consideredComplete()) {
+      resultFuture.complete(ConnectionRequestResults.forUnsafeDisconnect(packet, serverConn.getServer()));
     } else {
       resultFuture.complete(ConnectionRequestResults.forDisconnect(packet, serverConn.getServer()));
     }