Fix this up
This commit is contained in:
@@ -94,6 +94,9 @@ public class VelocityServerConnection implements MinecraftConnectionAssociation,
|
|||||||
new LoginSessionHandler(server, VelocityServerConnection.this, result));
|
new LoginSessionHandler(server, VelocityServerConnection.this, result));
|
||||||
startHandshake();
|
startHandshake();
|
||||||
} else {
|
} else {
|
||||||
|
// We need to remember to reset the in-flight connection to allow connect() to work
|
||||||
|
// properly.
|
||||||
|
proxyPlayer.resetInFlightConnection();
|
||||||
result.completeExceptionally(future.cause());
|
result.completeExceptionally(future.cause());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@@ -286,6 +286,10 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
|
|||||||
return connectedServer;
|
return connectedServer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void resetInFlightConnection() {
|
||||||
|
connectionInFlight = null;
|
||||||
|
}
|
||||||
|
|
||||||
public void handleConnectionException(RegisteredServer server, Throwable throwable) {
|
public void handleConnectionException(RegisteredServer server, Throwable throwable) {
|
||||||
if (throwable == null) {
|
if (throwable == null) {
|
||||||
throw new NullPointerException("throwable");
|
throw new NullPointerException("throwable");
|
||||||
|
Reference in New Issue
Block a user