From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 20 Jun 2021 00:08:13 -0700 Subject: [PATCH] Do not allow ticket level changes when updating chunk ticking state This WILL cause state corruption if it happens. So, don't allow it. diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java index 6f7794a6e5c832328ddc16ca9b76414ea08020ad..fbfbe9adeca7364e6346c887616890bf968f38a1 100644 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java @@ -436,7 +436,13 @@ public class ChunkHolder { CompletableFuture completablefuture1 = new CompletableFuture(); completablefuture1.thenRunAsync(() -> { + // Paper start - do not allow ticket level changes + boolean unloadingBefore = this.chunkMap.unloadingPlayerChunk; + this.chunkMap.unloadingPlayerChunk = true; + try { + // Paper end - do not allow ticket level changes playerchunkmap.onFullChunkStatusChange(this.pos, playerchunk_state); + } finally { this.chunkMap.unloadingPlayerChunk = unloadingBefore; } // Paper - do not allow ticket level changes }, executor); this.pendingFullStateConfirmation = completablefuture1; completablefuture.thenAccept((either) -> { @@ -453,7 +459,12 @@ public class ChunkHolder { private void demoteFullChunk(ChunkMap playerchunkmap, ChunkHolder.FullChunkStatus playerchunk_state) { this.pendingFullStateConfirmation.cancel(false); + // Paper start - do not allow ticket level changes + boolean unloadingBefore = this.chunkMap.unloadingPlayerChunk; + this.chunkMap.unloadingPlayerChunk = true; + try { // Paper end - do not allow ticket level changes playerchunkmap.onFullChunkStatusChange(this.pos, playerchunk_state); + } finally { this.chunkMap.unloadingPlayerChunk = unloadingBefore; } // Paper - do not allow ticket level changes } protected long updateCount; // Paper - correctly handle recursion