Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-01 05:58:00 +01:00
Code Issues Projects Releases Wiki Activity

Fix buffer view not being used with compression disabled

Browse Source
This commit is contained in:
themode 2021-09-26 17:35:14 +02:00
parent 236683c986
commit d02a898646
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/minestom/server/utils/PacketUtils.java
View File

@ -178,11 +178,12 @@ public final class PacketUtils {
public static void writeFramedPacket(@NotNull ByteBuffer buffer, public static void writeFramedPacket(@NotNull ByteBuffer buffer,
@NotNull ServerPacket packet, @NotNull ServerPacket packet,
boolean compression) { boolean compression) {
BinaryWriter writerView = BinaryWriter.view(buffer); // ensure that the buffer is not resized
if (!compression) { if (!compression) {
// Uncompressed format https://wiki.vg/Protocol#Without_compression // Uncompressed format https://wiki.vg/Protocol#Without_compression
final int lengthIndex = Utils.writeEmptyVarIntHeader(buffer); final int lengthIndex = Utils.writeEmptyVarIntHeader(buffer);
Utils.writeVarInt(buffer, packet.getId()); Utils.writeVarInt(buffer, packet.getId());
packet.write(new BinaryWriter(buffer)); packet.write(writerView);
final int finalSize = buffer.position() - (lengthIndex + 3); final int finalSize = buffer.position() - (lengthIndex + 3);
Utils.writeVarIntHeader(buffer, lengthIndex, finalSize); Utils.writeVarIntHeader(buffer, lengthIndex, finalSize);
return; return;
@ -193,7 +194,7 @@ public final class PacketUtils {
final int contentStart = buffer.position(); final int contentStart = buffer.position();
Utils.writeVarInt(buffer, packet.getId()); Utils.writeVarInt(buffer, packet.getId());
packet.write(BinaryWriter.view(buffer)); // ensure that the buffer is not resized/changed packet.write(writerView);
final int packetSize = buffer.position() - contentStart; final int packetSize = buffer.position() - contentStart;
final boolean compressed = packetSize >= MinecraftServer.getCompressionThreshold(); final boolean compressed = packetSize >= MinecraftServer.getCompressionThreshold();
if (compressed) { if (compressed) {