mirror/Velocity
2
0
Fork 0
mirror of https://github.com/PaperMC/Velocity.git synced 2025-01-06 14:24:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Better generic cleanup.

Browse Source
This commit is contained in:
Andrew Steinborn 2020-05-25 11:56:56 -04:00
parent 74ff56cbc9
commit 942e2f2e1a
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
View File

@ -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);