From 225385a43f5110d0bab7dfce3336eca65b48dcc5 Mon Sep 17 00:00:00 2001 From: s809 <43530948+s809@users.noreply.github.com> Date: Thu, 23 Apr 2026 00:26:32 +0500 Subject: [PATCH] Clean up received payload buffer check a bit --- .../core/multiplayer/fullData/FullDataPayloadReceiver.java | 6 +++--- 1 file changed, 3 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 b92572e2d..70d78b04c 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 @@ -7,10 +7,10 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.network.INetworkObject; import com.seibel.distanthorizons.core.network.messages.fullData.FullDataSplitMessage; 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 java.util.Objects; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; @@ -21,7 +21,7 @@ public class FullDataPayloadReceiver implements AutoCloseable .build(); private final ConcurrentMap buffersById = CacheBuilder.newBuilder() - .expireAfterAccess(10, TimeUnit.SECONDS) + .expireAfterAccess(30, TimeUnit.SECONDS) .build().asMap(); @Override @@ -56,7 +56,7 @@ public class FullDataPayloadReceiver implements AutoCloseable public FullDataSourceV2DTO decodeDataSource(FullDataPayload payload) { CompositeByteBuf compositeByteBuffer = this.buffersById.get(payload.dtoBufferId); - LodUtil.assertTrue(compositeByteBuffer != null, "decoded data source missing byte buffer"); + Objects.requireNonNull(compositeByteBuffer, "Unable to get a complete buffer for a received payload. Ignore this if it doesn't spam similar errors"); try {