From a565e7d9061e8a5fb1b2717104d4f0196c83901d Mon Sep 17 00:00:00 2001 From: Fabian Maurer Date: Fri, 19 Sep 2025 13:36:03 +0200 Subject: [PATCH] User older netty functions (1.7.10) --- .../core/multiplayer/fullData/FullDataPayloadReceiver.java | 6 ++++-- .../core/multiplayer/fullData/FullDataPayloadSender.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/fullData/FullDataPayloadReceiver.java b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/fullData/FullDataPayloadReceiver.java index 3f898e63c..540562698 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/fullData/FullDataPayloadReceiver.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/fullData/FullDataPayloadReceiver.java @@ -11,6 +11,7 @@ import com.seibel.distanthorizons.core.sql.dto.FullDataSourceV2DTO; import com.seibel.distanthorizons.core.util.LodUtil; import io.netty.buffer.CompositeByteBuf; import io.netty.buffer.Unpooled; +import io.netty.buffer.UnpooledByteBufAllocator; import org.apache.logging.log4j.LogManager; import java.util.Objects; @@ -38,7 +39,7 @@ public class FullDataPayloadReceiver implements AutoCloseable { if (message.isFirst) { - composite = Unpooled.compositeBuffer(); + composite = UnpooledByteBufAllocator.DEFAULT.compositeBuffer(); LOGGER.debug("Created new full data buffer [" + message.bufferId + "]: [" + composite + "]"); } else if (composite == null) @@ -47,7 +48,8 @@ public class FullDataPayloadReceiver implements AutoCloseable return null; } - composite.addComponent(true, message.buffer); + composite.addComponent(message.buffer); + composite.writerIndex(composite.writerIndex() + message.buffer.writerIndex()); LOGGER.debug("Updated full data buffer [" + message.bufferId + "]: [" + composite + "]."); return composite; }); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/fullData/FullDataPayloadSender.java b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/fullData/FullDataPayloadSender.java index f438bca52..8fa332402 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/fullData/FullDataPayloadSender.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/multiplayer/fullData/FullDataPayloadSender.java @@ -64,7 +64,7 @@ public class FullDataPayloadSender implements AutoCloseable int chunkSize = Math.min(Math.min(bytesToSend, FULL_DATA_SPLIT_SIZE_IN_BYTES), pendingTransfer.buffer.readableBytes()); boolean isFirstChunk = pendingTransfer.buffer.readerIndex() == 0; - FullDataSplitMessage chunkMessage = new FullDataSplitMessage(pendingTransfer.bufferId, pendingTransfer.buffer.readRetainedSlice(chunkSize), isFirstChunk); + FullDataSplitMessage chunkMessage = new FullDataSplitMessage(pendingTransfer.bufferId, pendingTransfer.buffer.readSlice(chunkSize).retain(), isFirstChunk); this.session.sendMessage(chunkMessage); bytesToSend -= chunkSize;