geforkt von Mirrors/Velocity
Remove duplicate in-flight connection reset
Dieser Commit ist enthalten in:
Ursprung
40ec39aa5e
Commit
669bd14779
@ -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());
|
||||
}
|
||||
});
|
||||
|
@ -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();
|
||||
}
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren