refactor: merge sync load detection

RelativityMC · Oct 29, 2024 · 354b818 · 354b818
1 parent 4022b7e
commit 354b818
Showing 1 changed file with 2 additions and 11 deletions.
diff --git a/c2me-base/src/main/java/com/ishland/c2me/base/mixin/priority/MixinServerChunkManager.java b/c2me-base/src/main/java/com/ishland/c2me/base/mixin/priority/MixinServerChunkManager.java
@@ -54,17 +54,8 @@ private void beforeAwaitChunk(ServerChunkManager.MainThreadExecutor instance, Bo
         syncLoadNanos = System.nanoTime();
         ((IVanillaChunkManager) this.chunkLoadingManager).c2me$getSchedulingManager().setCurrentSyncLoad(this.currentSyncLoadChunk);
         instance.runTasks(supplier);
-    }
-
-    @Inject(method = "getChunk(IILnet/minecraft/world/chunk/ChunkStatus;Z)Lnet/minecraft/world/chunk/Chunk;", at = @At("RETURN"))
-    private void afterGetChunk(int x, int z, ChunkStatus leastStatus, boolean create, CallbackInfoReturnable<Chunk> cir) {
-        if (Thread.currentThread() != this.serverThread) return;
-
-        if (this.currentSyncLoadChunk != null) {
-            this.currentSyncLoadChunk = null;
-//            System.out.println("Sync load took %.2fms".formatted((System.nanoTime() - syncLoadNanos) / 1e6));
-            ((IVanillaChunkManager) this.chunkLoadingManager).c2me$getSchedulingManager().setCurrentSyncLoad(null);
-        }
+        ((IVanillaChunkManager) this.chunkLoadingManager).c2me$getSchedulingManager().setCurrentSyncLoad(null);
+        this.currentSyncLoadChunk = null;
     }
 
     @Override