From 4a8da92be2f3809b6e3d433bf0a61e480a090a0f Mon Sep 17 00:00:00 2001
From: ishland <ishlandmc@yeah.net>
Date: Sat, 9 Nov 2024 13:24:06 +0800
Subject: [PATCH] change: drop shortcut existing chunks check

---
 .../0003-Shortcut-existing-chunks-check.patch | 82 -------------------
 ...erf-allow-unloading-to-be-cancelled.patch} |  0
 2 files changed, 82 deletions(-)
 delete mode 100644 patches/main/0003-Shortcut-existing-chunks-check.patch
 rename patches/main/{0004-perf-allow-unloading-to-be-cancelled.patch => 0003-perf-allow-unloading-to-be-cancelled.patch} (100%)

diff --git a/patches/main/0003-Shortcut-existing-chunks-check.patch b/patches/main/0003-Shortcut-existing-chunks-check.patch
deleted file mode 100644
index edad361..0000000
--- a/patches/main/0003-Shortcut-existing-chunks-check.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: ishland <ishlandmc@yeah.net>
-Date: Fri, 8 Nov 2024 22:51:42 +0800
-Subject: [PATCH] Shortcut existing chunks check
-
-
-diff --git a/c2me-rewrites-chunk-system/src/main/java/com/ishland/c2me/rewrites/chunksystem/mixin/MixinServerChunkManager.java b/c2me-rewrites-chunk-system/src/main/java/com/ishland/c2me/rewrites/chunksystem/mixin/MixinServerChunkManager.java
-index c2968495..8531e65f 100644
---- a/c2me-rewrites-chunk-system/src/main/java/com/ishland/c2me/rewrites/chunksystem/mixin/MixinServerChunkManager.java
-+++ b/c2me-rewrites-chunk-system/src/main/java/com/ishland/c2me/rewrites/chunksystem/mixin/MixinServerChunkManager.java
-@@ -36,20 +36,64 @@ public abstract class MixinServerChunkManager {
-     @Shadow
-     protected abstract @Nullable ChunkHolder getChunkHolder(long pos);
- 
-+    @Shadow @Final private long[] chunkPosCache;
-+
-+    @Shadow @Final private ChunkStatus[] chunkStatusCache;
-+
-+    @Shadow @Final private Chunk[] chunkCache;
-+
-     @Inject(method = "getChunk(IILnet/minecraft/world/chunk/ChunkStatus;Z)Lnet/minecraft/world/chunk/Chunk;", at = @At("HEAD"), cancellable = true)
-     private void shortcutGetChunk(int x, int z, ChunkStatus leastStatus, boolean create, CallbackInfoReturnable<Chunk> cir) {
-         if (Thread.currentThread() != this.serverThread) {
--            final ChunkHolder holder = this.getChunkHolder(ChunkPos.toLong(x, z));
--            if (holder != null) {
--                final CompletableFuture<OptionalChunk<Chunk>> future = holder.load(leastStatus, this.chunkLoadingManager); // thread-safe in new system
--                Chunk chunk = future.getNow(ChunkHolder.UNLOADED).orElse(null);
--                if (chunk instanceof WrapperProtoChunk readOnlyChunk) chunk = readOnlyChunk.getWrappedChunk();
-+            Chunk chunk = this.c2me$fastpathExistingChunks(x, z, leastStatus);
-+            if (chunk != null) {
-+                cir.setReturnValue(chunk);
-+                return;
-+            } else if (!create) {
-+                cir.setReturnValue(null);
-+                return;
-+            }
-+        } else { // on server thread
-+            if (!create) { // no create required
-+                Chunk chunk = this.c2me$getFromCahe(x, z, leastStatus, false);
-                 if (chunk != null) {
--                    cir.setReturnValue(chunk); // also cancels
--                    return;
-+                    cir.setReturnValue(chunk);
-+                } else {
-+                    cir.setReturnValue(this.c2me$fastpathExistingChunks(x, z, leastStatus));
-+                }
-+                return;
-+            }
-+        }
-+    }
-+
-+    @Unique
-+    private Chunk c2me$getFromCahe(int x, int z, ChunkStatus leastStatus, boolean create) {
-+        long l = ChunkPos.toLong(x, z);
-+
-+        if (this.chunkPosCache == null || this.chunkStatusCache == null || this.chunkCache == null) {
-+            return null; // no cache
-+        }
-+
-+        for (int i = 0; i < 4; i++) {
-+            if (l == this.chunkPosCache[i] && leastStatus == this.chunkStatusCache[i]) {
-+                Chunk chunk = this.chunkCache[i];
-+                if (chunk != null || !create) {
-+                    return chunk;
-                 }
-             }
-         }
-+
-+        return null;
-+    }
-+
-+    @Unique
-+    private Chunk c2me$fastpathExistingChunks(int x, int z, ChunkStatus leastStatus) {
-+        final ChunkHolder holder = this.getChunkHolder(ChunkPos.toLong(x, z));
-+        if (holder != null) {
-+            final CompletableFuture<OptionalChunk<Chunk>> future = holder.load(leastStatus, this.chunkLoadingManager); // thread-safe in new system
-+            return future.getNow(ChunkHolder.UNLOADED).orElse(null);
-+        }
-+        return null;
-     }
- 
-     @Inject(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/world/ServerChunkManager;updateChunks()Z", shift = At.Shift.AFTER))
diff --git a/patches/main/0004-perf-allow-unloading-to-be-cancelled.patch b/patches/main/0003-perf-allow-unloading-to-be-cancelled.patch
similarity index 100%
rename from patches/main/0004-perf-allow-unloading-to-be-cancelled.patch
rename to patches/main/0003-perf-allow-unloading-to-be-cancelled.patch