From bd3972e4df3661739256726380b97fe839ade61b Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Tue, 24 May 2022 00:07:56 -0400 Subject: [PATCH] fix off-by-one for chunk spirals --- .../debugaid/ResourceLeakDetectorDisableConditionalMixin.java | 2 +- .../flushconsolidation/ThreadedAnvilChunkStorageMixin.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/steinborn/krypton/mixin/shared/debugaid/ResourceLeakDetectorDisableConditionalMixin.java b/src/main/java/me/steinborn/krypton/mixin/shared/debugaid/ResourceLeakDetectorDisableConditionalMixin.java index 1ab3418..d9c2331 100644 --- a/src/main/java/me/steinborn/krypton/mixin/shared/debugaid/ResourceLeakDetectorDisableConditionalMixin.java +++ b/src/main/java/me/steinborn/krypton/mixin/shared/debugaid/ResourceLeakDetectorDisableConditionalMixin.java @@ -8,7 +8,7 @@ @Mixin(SharedConstants.class) public class ResourceLeakDetectorDisableConditionalMixin { - @Redirect(method = "", at = @At(value = "INVOKE", target = "Lio/netty/util/ResourceLeakDetector;setLevel(Lio/netty/util/ResourceLeakDetector$Level;)V")) + //@Redirect(method = "", at = @At(value = "INVOKE", target = "Lio/netty/util/ResourceLeakDetector;setLevel(Lio/netty/util/ResourceLeakDetector$Level;)V")) private static void clinit$resourceLeakDetectorDisableConditional(ResourceLeakDetector.Level level) { if (System.getProperty("io.netty.leakDetection.level") == null) { // Allow the user to override the leak detection level in the Minecraft server with the diff --git a/src/main/java/me/steinborn/krypton/mixin/shared/network/flushconsolidation/ThreadedAnvilChunkStorageMixin.java b/src/main/java/me/steinborn/krypton/mixin/shared/network/flushconsolidation/ThreadedAnvilChunkStorageMixin.java index 52c06e4..c72d65f 100644 --- a/src/main/java/me/steinborn/krypton/mixin/shared/network/flushconsolidation/ThreadedAnvilChunkStorageMixin.java +++ b/src/main/java/me/steinborn/krypton/mixin/shared/network/flushconsolidation/ThreadedAnvilChunkStorageMixin.java @@ -181,7 +181,7 @@ private void sendSpiralChunkWatchPackets(ServerPlayerEntity player) { int t = this.watchDistance * 2; int maxI = t * t * 2; for (int i = 0; i < maxI; i++) { - if ((-this.watchDistance <= x) && (x <= this.watchDistance) && (-this.watchDistance <= z) && (z <= this.watchDistance)) { + if ((-this.watchDistance - 1 <= x) && (x <= this.watchDistance + 1) && (-this.watchDistance - 1 <= z) && (z <= this.watchDistance + 1)) { this.sendWatchPackets(player, new ChunkPos(chunkPosX + x, chunkPosZ + z), new MutableObject<>(), false, true);