Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-12-29 04:28:21 +01:00
Code Issues Projects Releases Wiki Activity

Framed packet cleanup 3

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

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

@ -223,24 +223,22 @@ public final class PacketUtils {
public static void writeFramedPacket(@NotNull ByteBuf buffer,
@NotNull ServerPacket serverPacket) {
final int compressionThreshold = MinecraftServer.getCompressionThreshold();
final boolean compressionEnabled = compressionThreshold > 0;
// Index of the var-int containing the complete packet length
final int packetLengthIndex = Utils.writeEmptyVarIntHeader(buffer);
if (compressionEnabled) {
if (compressionThreshold > 0) {
// Index of the uncompressed payload length
final int dataLengthIndex = Utils.writeEmptyVarIntHeader(buffer);
// Write packet
final int contentIndex = buffer.writerIndex();
writePacket(buffer, serverPacket);
final int packetSize = (buffer.writerIndex() - dataLengthIndex) - Utils.VARINT_HEADER_SIZE;
final int packetSize = buffer.writerIndex() - contentIndex;
int uncompressedLength = 0;
if (packetSize >= compressionThreshold) {
final int uncompressedLength = packetSize >= compressionThreshold ? packetSize : 0;
Utils.overrideVarIntHeader(buffer, dataLengthIndex, uncompressedLength);
if (uncompressedLength > 0) {
// Packet large enough, compress
uncompressedLength = packetSize;
final VelocityCompressor compressor = COMPRESSOR.get();
// Compress id + payload
ByteBuf uncompressedCopy = buffer.copy(contentIndex, packetSize);
@ -248,19 +246,13 @@ public final class PacketUtils {
compress(compressor, uncompressedCopy, buffer);
uncompressedCopy.release();
}
// Fill header
final int totalPacketLength = buffer.writerIndex() - packetLengthIndex - Utils.VARINT_HEADER_SIZE;
Utils.overrideVarIntHeader(buffer, packetLengthIndex, totalPacketLength);
Utils.overrideVarIntHeader(buffer, dataLengthIndex, uncompressedLength);
} else {
// No compression, write packet id + payload
writePacket(buffer, serverPacket);
// Rewrite dummy var-int to packet length
final int packetSize = (buffer.writerIndex() - packetLengthIndex) - Utils.VARINT_HEADER_SIZE;
Utils.overrideVarIntHeader(buffer, packetLengthIndex, packetSize);
}
// Total length
final int totalPacketLength = buffer.writerIndex() - packetLengthIndex - Utils.VARINT_HEADER_SIZE;
Utils.overrideVarIntHeader(buffer, packetLengthIndex, totalPacketLength);
}
/**