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

Merge branch 'dev/1.1.0' into future/1.16.2-velocity-1.1.0

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Andrew Steinborn 2020-08-06 17:37:10 -04:00
Commit cb4555fa70
2 geänderte Dateien mit 9 neuen und 8 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

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

@ -157,12 +157,12 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
logger.error("{}: read timed out", association); logger.error("{}: read timed out", association);
} else { } else {
boolean isQuietDecoderException = cause instanceof QuietDecoderException; boolean isQuietDecoderException = cause instanceof QuietDecoderException;
boolean willLogQuietDecoderException = isQuietDecoderException boolean willLogQuietDecoderException = !isQuietDecoderException
&& !(sessionHandler instanceof LoginSessionHandler) || (!(sessionHandler instanceof LoginSessionHandler)
&& !(sessionHandler instanceof HandshakeSessionHandler); && !(sessionHandler instanceof HandshakeSessionHandler));
if (willLogQuietDecoderException) { if (willLogQuietDecoderException) {
logger.error("{}: exception encountered in {}", association, sessionHandler, cause); logger.error("{}: exception encountered in {}", association, sessionHandler, cause);
} else if (isQuietDecoderException) { } else {
knownDisconnect = true; knownDisconnect = true;
} }
} }

9
proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/PlayerListItem.java
Datei anzeigen

@ -58,7 +58,7 @@ public class PlayerListItem implements MinecraftPacket {
item.setProperties(ProtocolUtils.readProperties(buf)); item.setProperties(ProtocolUtils.readProperties(buf));
item.setGameMode(ProtocolUtils.readVarInt(buf)); item.setGameMode(ProtocolUtils.readVarInt(buf));
item.setLatency(ProtocolUtils.readVarInt(buf)); item.setLatency(ProtocolUtils.readVarInt(buf));
item.setDisplayName(readOptionalComponent(buf)); item.setDisplayName(readOptionalComponent(buf, version));
break; break;
case UPDATE_GAMEMODE: case UPDATE_GAMEMODE:
item.setGameMode(ProtocolUtils.readVarInt(buf)); item.setGameMode(ProtocolUtils.readVarInt(buf));
@ -67,7 +67,7 @@ public class PlayerListItem implements MinecraftPacket {
item.setLatency(ProtocolUtils.readVarInt(buf)); item.setLatency(ProtocolUtils.readVarInt(buf));
break; break;
case UPDATE_DISPLAY_NAME: case UPDATE_DISPLAY_NAME:
item.setDisplayName(readOptionalComponent(buf)); item.setDisplayName(readOptionalComponent(buf, version));
break; break;
case REMOVE_PLAYER: case REMOVE_PLAYER:
//Do nothing, all that is needed is the uuid //Do nothing, all that is needed is the uuid
@ -85,9 +85,10 @@ public class PlayerListItem implements MinecraftPacket {
} }
} }
private static @Nullable Component readOptionalComponent(ByteBuf buf) { private static @Nullable Component readOptionalComponent(ByteBuf buf, ProtocolVersion version) {
if (buf.readBoolean()) { if (buf.readBoolean()) {
return GsonComponentSerializer.gson().deserialize(ProtocolUtils.readString(buf)); return ProtocolUtils.getJsonChatSerializer(version)
.deserialize(ProtocolUtils.readString(buf));
} }
return null; return null;
} }