Merge branch 'dev/1.1.0' into decode-multiple

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

@@ -84,9 +84,7 @@ public class VelocityServerConnection implements MinecraftConnectionAssociation,
             connectionPhase = connection.getType().getInitialBackendPhase();
             startHandshake();
           } else {
-            // We need to remember to reset the in-flight connection to allow connect() to work
-            // properly.
-            proxyPlayer.resetInFlightConnection();
+            // Complete the result immediately. ConnectedPlayer will reset the in-flight connection.
             result.completeExceptionally(future.cause());
           }
         });

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

@@ -758,12 +758,12 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
                       ConnectedPlayer.this, server);
                   connectionInFlight = con;
                   return con.connect().whenCompleteAsync((result, throwable) ->
-                      this.cleanupIfRequired(con), connection.eventLoop());
+                      this.resetIfInFlightIs(con), connection.eventLoop());
                 }, connection.eventLoop());
           });
     }
 
-    private void cleanupIfRequired(VelocityServerConnection establishedConnection) {
+    private void resetIfInFlightIs(VelocityServerConnection establishedConnection) {
       if (establishedConnection == connectionInFlight) {
         resetInFlightConnection();
       }