From 254ac170de0e947a705732ed2472fa53f5ca3ccb Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Thu, 24 Jun 2021 02:12:47 -0700 Subject: [PATCH] Do not cancel chunk load on ticket level change (#5978) New chunk system doesn't do cancellations anymore. Co-authored-by: Spottedleaf --- .../server/Asynchronous-chunk-IO-and-loading.patch | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/patches/server/Asynchronous-chunk-IO-and-loading.patch b/patches/server/Asynchronous-chunk-IO-and-loading.patch index 70a05f3f46..fde16335ba 100644 --- a/patches/server/Asynchronous-chunk-IO-and-loading.patch +++ b/patches/server/Asynchronous-chunk-IO-and-loading.patch @@ -2343,19 +2343,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 ChunkHolder.FullChunkStatus playerchunk_state = ChunkHolder.getFullChunkStatus(this.oldTicketLevel); ChunkHolder.FullChunkStatus playerchunk_state1 = ChunkHolder.getFullChunkStatus(this.ticketLevel); // CraftBukkit start -@@ -0,0 +0,0 @@ public class ChunkHolder { - } - }); - -+ // Paper start -+ if (!flag1) { -+ chunkStorage.level.asyncChunkTaskManager.cancelChunkLoad(this.pos.x, this.pos.z); -+ } -+ // Paper end -+ - for (int i = flag1 ? chunkstatus1.getIndex() + 1 : 0; i <= chunkstatus.getIndex(); ++i) { - completablefuture = (CompletableFuture) this.futures.get(i); - if (completablefuture == null) { diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java