MiniDay/Velocity
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Reset in-flight connection only if the server disconnects the client.

Browse Source
This commit is contained in:
Andrew Steinborn
2020-05-25 11:44:02 -04:00
parent b0f1398b45
commit 64c16e61d2
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -766,12 +766,13 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
public CompletableFuture<Result> connect() { public CompletableFuture<Result> connect() {
return this.internalConnect() return this.internalConnect()
.whenCompleteAsync((status, throwable) -> { .whenCompleteAsync((status, throwable) -> {
if (status != null && !status.isSafe()) { if (status != null && !status.isSuccessful()) {
// If it's not safe to continue the connection we need to shut it down. if (!status.isSafe()) {
handleConnectionException(status.getAttemptedConnection(), throwable, true); handleConnectionException(status.getAttemptedConnection(), throwable, false);
} else if ((status != null && !status.isSuccessful())) { } else if (status.getStatus() == Status.SERVER_DISCONNECTED) {
resetInFlightConnection(); resetInFlightConnection();
} }
}
}, connection.eventLoop()) }, connection.eventLoop())
.thenApply(x -> x); .thenApply(x -> x);
} }