Merge branch 'dev/1.1.0' into decode-multiple

This commit is contained in:
Andrew Steinborn
2019-12-31 21:43:11 -05:00
2 changed files with 16 additions and 2 deletions

View File

@@ -571,8 +571,10 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
if (connectedServer != null) {
connectedServer.disconnect();
}
boolean isConnected = server.getPlayer(this.getUniqueId()).isPresent();
server.unregisterConnection(this);
server.getEventManager().fire(new DisconnectEvent(this))
server.getEventManager().fire(new DisconnectEvent(this, !isConnected))
.thenRun(() -> this.teardownFuture.complete(null));
}