13
0
geforkt von Mirrors/Velocity

Fix misplaced connection in flight reset. Fixes #173

Dieser Commit ist enthalten in:
Andrew Steinborn 2019-02-19 15:09:58 -05:00
Ursprung 6a8345e045
Commit 1ec070069f

Datei anzeigen

@ -388,13 +388,13 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
Component friendlyReason) { Component friendlyReason) {
server.getEventManager().fire(originalEvent) server.getEventManager().fire(originalEvent)
.thenAcceptAsync(event -> { .thenAcceptAsync(event -> {
// There can't be any connection in flight now.
connectionInFlight = null;
if (event.getResult() instanceof DisconnectPlayer) { if (event.getResult() instanceof DisconnectPlayer) {
DisconnectPlayer res = (DisconnectPlayer) event.getResult(); DisconnectPlayer res = (DisconnectPlayer) event.getResult();
disconnect(res.getReason()); disconnect(res.getReason());
} else if (event.getResult() instanceof RedirectPlayer) { } else if (event.getResult() instanceof RedirectPlayer) {
// There can't be any connection in flight now.
connectionInFlight = null;
RedirectPlayer res = (RedirectPlayer) event.getResult(); RedirectPlayer res = (RedirectPlayer) event.getResult();
createConnectionRequest(res.getServer()) createConnectionRequest(res.getServer())
.connectWithIndication() .connectWithIndication()