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

Read PlayerListItem display names according to the protocol version.

Quellcode durchsuchen 
Fixes #349
Dieser Commit ist enthalten in:
Andrew Steinborn 2020-08-06 15:13:22 -04:00
Ursprung 6cec09974a
Commit 5cceebdffc
1 geänderte Dateien mit 5 neuen und 4 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

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.setGameMode(ProtocolUtils.readVarInt(buf));
item.setLatency(ProtocolUtils.readVarInt(buf));
item.setDisplayName(readOptionalComponent(buf));
item.setDisplayName(readOptionalComponent(buf, version));
break;
case UPDATE_GAMEMODE:
item.setGameMode(ProtocolUtils.readVarInt(buf));
@ -67,7 +67,7 @@ public class PlayerListItem implements MinecraftPacket {
item.setLatency(ProtocolUtils.readVarInt(buf));
break;
case UPDATE_DISPLAY_NAME:
item.setDisplayName(readOptionalComponent(buf));
item.setDisplayName(readOptionalComponent(buf, version));
break;
case REMOVE_PLAYER:
//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()) {
return GsonComponentSerializer.gson().deserialize(ProtocolUtils.readString(buf));
return ProtocolUtils.getJsonChatSerializer(version)
.deserialize(ProtocolUtils.readString(buf));
}
return null;
}