From 4ffd4b64705ddf2c633768fb0dafbf20fe516bf9 Mon Sep 17 00:00:00 2001 From: Moritz Zwerger Date: Mon, 9 Oct 2023 00:01:48 +0200 Subject: [PATCH] fix brand reading in > 1.13 --- .../network/connection/play/channel/vanila/BrandHandler.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/channel/vanila/BrandHandler.kt b/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/channel/vanila/BrandHandler.kt index 79d96f2cf..947d38244 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/channel/vanila/BrandHandler.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/channel/vanila/BrandHandler.kt @@ -20,6 +20,7 @@ import de.bixilon.minosoft.protocol.ProtocolUtil.encodeNetwork import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection import de.bixilon.minosoft.protocol.network.connection.play.channel.play.PlayChannelHandler import de.bixilon.minosoft.protocol.packets.c2s.common.ChannelC2SP +import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayInByteBuffer import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayOutByteBuffer @@ -51,7 +52,7 @@ object BrandHandler { ) : PlayChannelHandler { override fun handle(buffer: PlayInByteBuffer) { - connection.serverInfo.brand = buffer.readString(buffer.bytesLeft) + connection.serverInfo.brand = buffer.readString(if (buffer.versionId < ProtocolDefinition.FLATTENING_VERSION) buffer.readVarInt() else buffer.bytesLeft) } } }