PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

#3527: Switching between servers causes a decoding error

Browse Source
This commit is contained in:
md_5
2023-09-26 06:35:48 +10:00
parent f3397b3003
commit 3cb7a12738
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
protocol/src/main/java/net/md_5/bungee/protocol/LegacyDecoder.java
View File

@@ -31,12 +31,12 @@ public class LegacyDecoder extends ByteToMessageDecoder
if ( packetID == 0xFE )
{
out.add( new PacketWrapper( new LegacyPing( in.isReadable() && in.readUnsignedByte() == 0x01 ), Unpooled.EMPTY_BUFFER ) );
out.add( new PacketWrapper( new LegacyPing( in.isReadable() && in.readUnsignedByte() == 0x01 ), Unpooled.EMPTY_BUFFER, Protocol.STATUS ) );
return;
} else if ( packetID == 0x02 && in.isReadable() )
{
in.skipBytes( in.readableBytes() );
out.add( new PacketWrapper( new LegacyHandshake(), Unpooled.EMPTY_BUFFER ) );
out.add( new PacketWrapper( new LegacyHandshake(), Unpooled.EMPTY_BUFFER, Protocol.STATUS ) );
return;
}

2
protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
View File

@@ -50,7 +50,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
in.skipBytes( in.readableBytes() );
}
out.add( new PacketWrapper( packet, slice ) );
out.add( new PacketWrapper( packet, slice, protocol ) );
slice = null;
} finally
{

1
protocol/src/main/java/net/md_5/bungee/protocol/PacketWrapper.java
View File

@@ -10,6 +10,7 @@ public class PacketWrapper
public final DefinedPacket packet;
public final ByteBuf buf;
public final Protocol protocol;
@Setter
private boolean released;