From 56b5b7d452e8173ee005c941010632aeb6dbecaf Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Sat, 15 Jun 2024 19:57:59 +0200
Subject: [PATCH] Fix max chunk status checks

---
 ...Chunk-System-Starlight-from-Moonrise.patch | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/patches/server/0989-Chunk-System-Starlight-from-Moonrise.patch b/patches/server/0989-Chunk-System-Starlight-from-Moonrise.patch
index fcf1f488ff..9be7b6a3fc 100644
--- a/patches/server/0989-Chunk-System-Starlight-from-Moonrise.patch
+++ b/patches/server/0989-Chunk-System-Starlight-from-Moonrise.patch
@@ -10995,7 +10995,7 @@ index 0000000000000000000000000000000000000000..f52e104b3e07825caf0d6d1bda2e45c8
 +}
 diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/NewChunkHolder.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/NewChunkHolder.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..545624cfeefacc7bff3bb24adc9b6d52672db701
+index 0000000000000000000000000000000000000000..cbc48ffafd3afd8d9f71790fafd15fcecfcedd78
 --- /dev/null
 +++ b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/NewChunkHolder.java
 @@ -0,0 +1,2014 @@
@@ -11976,8 +11976,8 @@ index 0000000000000000000000000000000000000000..545624cfeefacc7bff3bb24adc9b6d52
 +        final boolean oldUnloaded = oldLevel > ChunkHolderManager.MAX_TICKET_LEVEL;
 +        final boolean newUnloaded = newLevel > ChunkHolderManager.MAX_TICKET_LEVEL;
 +
-+        final ChunkStatus maxGenerationStatusOld = ChunkLevel.generationStatus(oldLevel);
-+        final ChunkStatus maxGenerationStatusNew = ChunkLevel.generationStatus(newLevel);
++        final ChunkStatus maxGenerationStatusOld = ChunkLevel.generationStatusOrEmpty(oldLevel);
++        final ChunkStatus maxGenerationStatusNew = ChunkLevel.generationStatusOrEmpty(newLevel);
 +
 +        // check for cancellations from downgrading ticket level
 +        if (this.requestedGenStatus != null && !newState.isOrAfter(FullChunkStatus.FULL) && newLevel > oldLevel) {
@@ -22983,7 +22983,7 @@ index c643bb0daa5cd264fd6ebab7acf0a2bdd7fe7029..0048077dedd19adc6c5a88e7d916d88a
      // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkLevel.java b/src/main/java/net/minecraft/server/level/ChunkLevel.java
-index d9ad32acdf46a43a649334a3b736aeb7b3af21d1..fae17a075d7efaf24d916877dd5968eb9652bb66 100644
+index d9ad32acdf46a43a649334a3b736aeb7b3af21d1..e56b9333a4d99fa6a94e923cb5e8c7544c6309bf 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkLevel.java
 @@ -7,9 +7,9 @@ import net.minecraft.world.level.chunk.status.ChunkStep;
@@ -22999,6 +22999,19 @@ index d9ad32acdf46a43a649334a3b736aeb7b3af21d1..fae17a075d7efaf24d916877dd5968eb
      private static final ChunkStep FULL_CHUNK_STEP = ChunkPyramid.GENERATION_PYRAMID.getStepTo(ChunkStatus.FULL);
      public static final int RADIUS_AROUND_FULL_CHUNK = FULL_CHUNK_STEP.accumulatedDependencies().getRadius();
      public static final int MAX_LEVEL = 33 + RADIUS_AROUND_FULL_CHUNK;
+@@ -19,6 +19,12 @@ public class ChunkLevel {
+         return getStatusAroundFullChunk(level - 33, null);
+     }
+ 
++    // Paper start - rewrite chunk system
++    public static ChunkStatus generationStatusOrEmpty(int level) {
++        return getStatusAroundFullChunk(level - 33, ChunkStatus.EMPTY);
++    }
++    // Paper end - rewrite chunk system
++
+     @Nullable
+     @Contract("_,!null->!null;_,_->_")
+     public static ChunkStatus getStatusAroundFullChunk(int additionalLevel, @Nullable ChunkStatus emptyStatus) {
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
 index 2ce7da9707d7c1a48b5609ae51a516d599d7aee8..b849e0cf15f894aa87b1bb397d85b887b8fb816e 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -24365,7 +24378,7 @@ index cbabbfbb9967ddf9a56f3be24a88e0fcd4415aa2..71abe25cfb73af3857cbc85980aa32d0
 +    }*/  // Paper - rewrite chunk system
  }
 diff --git a/src/main/java/net/minecraft/server/level/GenerationChunkHolder.java b/src/main/java/net/minecraft/server/level/GenerationChunkHolder.java
-index 3dc1daa3c6a04d3ff1a2353773b465fc380994a2..4fa938e2d893c0db7d3fbd4c20b829cb895fa2f6 100644
+index 3dc1daa3c6a04d3ff1a2353773b465fc380994a2..864f521e1d683b106ec109d5927679467cd6bb38 100644
 --- a/src/main/java/net/minecraft/server/level/GenerationChunkHolder.java
 +++ b/src/main/java/net/minecraft/server/level/GenerationChunkHolder.java
 @@ -27,249 +27,113 @@ public abstract class GenerationChunkHolder {
@@ -24621,7 +24634,7 @@ index 3dc1daa3c6a04d3ff1a2353773b465fc380994a2..4fa938e2d893c0db7d3fbd4c20b829cb
 +        // Paper start - rewrite chunk system
 +        final ChunkStatus maxStatus = ChunkLevel.generationStatus(this.getTicketLevel());
 +
-+        if (requestedStatus.isOrAfter(maxStatus)) {
++        if (maxStatus == null || requestedStatus.isOrAfter(maxStatus)) {
 +            return null;
 +        }
 +