13
0
geforkt von Mirrors/Velocity

Remove kqueue bug workaround since the issue is now fixed upstream

See https://github.com/netty/netty/pull/9149
Dieser Commit ist enthalten in:
Andrew Steinborn 2019-07-02 02:36:46 -04:00
Ursprung e31b2b87dc
Commit 5b518eaf20

Datei anzeigen

@ -404,18 +404,14 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
} }
if (connectedServer == null) { if (connectedServer == null) {
// The player isn't yet connected to a server. Note that we need to do this in a future run Optional<RegisteredServer> nextServer = getNextServerToTry(rs);
// of the event loop due to an issue with the Netty kqueue transport. if (nextServer.isPresent()) {
minecraftConnection.eventLoop().execute(() -> { // There can't be any connection in flight now.
Optional<RegisteredServer> nextServer = getNextServerToTry(rs); resetInFlightConnection();
if (nextServer.isPresent()) { createConnectionRequest(nextServer.get()).fireAndForget();
// There can't be any connection in flight now. } else {
resetInFlightConnection(); disconnect(friendlyReason);
createConnectionRequest(nextServer.get()).fireAndForget(); }
} else {
disconnect(friendlyReason);
}
});
} else { } else {
boolean kickedFromCurrent = connectedServer.getServer().equals(rs); boolean kickedFromCurrent = connectedServer.getServer().equals(rs);
ServerKickResult result; ServerKickResult result;