fix off-by-one for chunk spirals

astei · May 24, 2022 · bd3972e · bd3972e
1 parent 8a3179d
commit bd3972e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.../steinborn/krypton/mixin/shared/debugaid/ResourceLeakDetectorDisableConditionalMixin.java b/.../steinborn/krypton/mixin/shared/debugaid/ResourceLeakDetectorDisableConditionalMixin.java
@@ -8,7 +8,7 @@
 
 @Mixin(SharedConstants.class)
 public class ResourceLeakDetectorDisableConditionalMixin {
-    @Redirect(method = "<clinit>", at = @At(value = "INVOKE", target = "Lio/netty/util/ResourceLeakDetector;setLevel(Lio/netty/util/ResourceLeakDetector$Level;)V"))
+    //@Redirect(method = "<clinit>", 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/...nborn/krypton/mixin/shared/network/flushconsolidation/ThreadedAnvilChunkStorageMixin.java b/...nborn/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);