From 6548d5da805d0a68f3e7a6fa1bc8e3263713bf59 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Wed, 12 Jul 2023 11:28:19 -0400 Subject: [PATCH] Fix parity issue in paper_chunk_patches for 1.20+ Ensure scheduleChunkGeneration is correctly called if chunk status has load dependencies Thanks to ishland for noticing this --- .../common/mixin/bugfix/paper_chunk_patches/ChunkMapMixin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/paper_chunk_patches/ChunkMapMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/paper_chunk_patches/ChunkMapMixin.java index 75756176..c4e1771e 100644 --- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/paper_chunk_patches/ChunkMapMixin.java +++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/paper_chunk_patches/ChunkMapMixin.java @@ -86,7 +86,7 @@ public abstract class ChunkMapMixin { */ @Inject(method = "schedule", at = @At("HEAD"), cancellable = true) private void useLegacySchedulingLogic(ChunkHolder holder, ChunkStatus requiredStatus, CallbackInfoReturnable>> cir) { - if(requiredStatus != ChunkStatus.EMPTY) { + if(requiredStatus != ChunkStatus.EMPTY && !requiredStatus.hasLoadDependencies()) { ChunkPos chunkpos = holder.getPos(); CompletableFuture> future = holder.getOrScheduleFuture(requiredStatus.getParent(), (ChunkMap)(Object)this); cir.setReturnValue(future.thenComposeAsync((either) -> {