SteamWar/Velocity
13
0
Fork 0
geforkt von Mirrors/Velocity
Code Issues Pull-Requests Aktivität

Small cleanup in closeWith

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Andrew Steinborn 2020-08-22 15:52:29 -04:00
Ursprung 005c12fb0f
Commit 6b26daa281
1 geänderte Dateien mit 3 neuen und 3 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

6
proxy/src/main/java/com/velocitypowered/proxy/connection/MinecraftConnection.java
Datei anzeigen

@ -225,13 +225,13 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
public void closeWith(Object msg) { public void closeWith(Object msg) {
if (channel.isActive()) { if (channel.isActive()) {
boolean is1Point8 = this.getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_8) >= 0; boolean is1Point8 = this.getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_8) >= 0;
boolean isLegacyPing = this.getState() == StateRegistry.HANDSHAKE boolean isLegacyOrPing = this.getState() == StateRegistry.HANDSHAKE
|| this.getState() == StateRegistry.STATUS; || this.getState() == StateRegistry.STATUS;
if (channel.eventLoop().inEventLoop() && (is1Point8 || isLegacyPing)) { if (channel.eventLoop().inEventLoop() && (is1Point8 || isLegacyOrPing)) {
knownDisconnect = true; knownDisconnect = true;
channel.writeAndFlush(msg).addListener(ChannelFutureListener.CLOSE); channel.writeAndFlush(msg).addListener(ChannelFutureListener.CLOSE);
} else { } else {
// 1.7.x versions have a race condition with switching protocol versions, so just explicitly // 1.7.x versions have a race condition with switching protocol states, so just explicitly
// close the connection after a short while. // close the connection after a short while.
this.setAutoReading(false); this.setAutoReading(false);
channel.eventLoop().schedule(() -> { channel.eventLoop().schedule(() -> {