Better generic cleanup.

proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java

@@ -757,11 +757,18 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
                   VelocityServerConnection con = new VelocityServerConnection(vrs,
                       ConnectedPlayer.this, server);
                   connectionInFlight = con;
-                  return con.connect();
+                  return con.connect().whenCompleteAsync((result, throwable) ->
+                      this.cleanupIfRequired(con));
                 }, connection.eventLoop());
           });
     }
 
+    private void cleanupIfRequired(VelocityServerConnection establishedConnection) {
+      if (establishedConnection == connectionInFlight) {
+        resetInFlightConnection();
+      }
+    }
+
     @Override
     public CompletableFuture<Result> connect() {
       return this.internalConnect()
@@ -769,11 +776,7 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
             if (status != null && !status.isSuccessful()) {
               if (!status.isSafe()) {
                 handleConnectionException(status.getAttemptedConnection(), throwable, false);
-              } else if (status.getStatus() == Status.SERVER_DISCONNECTED) {
-                resetInFlightConnection();
               }
-            } else if (throwable != null) {
-              resetInFlightConnection();
             }
           }, connection.eventLoop())
           .thenApply(x -> x);