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

Framed packet cleanup 2

Browse Source
This commit is contained in:
TheMode 2021-05-10 07:00:16 +02:00
parent b96386cee5
commit 590b42c223
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -234,11 +234,12 @@ public final class PacketUtils {
// Write packet // Write packet
final int contentIndex = buffer.writerIndex(); final int contentIndex = buffer.writerIndex();
writePacket(buffer, serverPacket); writePacket(buffer, serverPacket);
final int afterIndex = buffer.writerIndex(); final int packetSize = (buffer.writerIndex() - dataLengthIndex) - Utils.VARINT_HEADER_SIZE;
final int packetSize = (afterIndex - dataLengthIndex) - Utils.VARINT_HEADER_SIZE;
int uncompressedLength = 0;
if (packetSize >= compressionThreshold) { if (packetSize >= compressionThreshold) {
// Packet large enough // Packet large enough, compress
uncompressedLength = packetSize;
final VelocityCompressor compressor = COMPRESSOR.get(); final VelocityCompressor compressor = COMPRESSOR.get();
// Compress id + payload // Compress id + payload
@ -246,18 +247,12 @@ public final class PacketUtils {
buffer.writerIndex(contentIndex); buffer.writerIndex(contentIndex);
compress(compressor, uncompressedCopy, buffer); compress(compressor, uncompressedCopy, buffer);
uncompressedCopy.release(); uncompressedCopy.release();
final int totalPacketLength = buffer.writerIndex() - contentIndex + Utils.VARINT_HEADER_SIZE;
// Update header values
Utils.overrideVarIntHeader(buffer, packetLengthIndex, totalPacketLength);
Utils.overrideVarIntHeader(buffer, dataLengthIndex, packetSize);
} else {
// Packet too small, just override header values
final int totalPacketLength = packetSize + Utils.VARINT_HEADER_SIZE;
Utils.overrideVarIntHeader(buffer, packetLengthIndex, totalPacketLength);
Utils.overrideVarIntHeader(buffer, dataLengthIndex, 0); // -> Uncompressed
} }
// Fill header
final int totalPacketLength = buffer.writerIndex() - packetLengthIndex - Utils.VARINT_HEADER_SIZE;
Utils.overrideVarIntHeader(buffer, packetLengthIndex, totalPacketLength);
Utils.overrideVarIntHeader(buffer, dataLengthIndex, uncompressedLength);
} else { } else {
// No compression, write packet id + payload // No compression, write packet id + payload
writePacket(buffer, serverPacket); writePacket(buffer, serverPacket);