From c7006765bda10d10c9604c78e1b12e52906da8e8 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Thu, 8 Jun 2023 16:35:02 -0700
Subject: [PATCH] Fix final compilation issues

---
 patches/server/Allow-delegation-to-vanilla-chunk-gen.patch | 6 ++----
 patches/server/Optimise-general-POI-access.patch           | 2 +-
 patches/server/Rewrite-chunk-system.patch                  | 5 +++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/patches/server/Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/Allow-delegation-to-vanilla-chunk-gen.patch
index e15c3d8fa1..5ad66808e1 100644
--- a/patches/server/Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/Allow-delegation-to-vanilla-chunk-gen.patch
@@ -21,8 +21,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        net.minecraft.world.level.chunk.ChunkStatus.NOISE,
 +        net.minecraft.world.level.chunk.ChunkStatus.SURFACE,
 +        net.minecraft.world.level.chunk.ChunkStatus.CARVERS,
-+        net.minecraft.world.level.chunk.ChunkStatus.LIQUID_CARVERS,
 +        net.minecraft.world.level.chunk.ChunkStatus.FEATURES,
++        net.minecraft.world.level.chunk.ChunkStatus.INITIALIZE_LIGHT,
 +        net.minecraft.world.level.chunk.ChunkStatus.LIGHT
 +    );
 +
@@ -77,8 +77,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                chunk -> {
 +                    throw new UnsupportedOperationException("Not creating full chunks here");
 +                },
-+                chunks,
-+                true
++                chunks
 +            ).thenAccept(either -> {
 +                if (chunkStatus == net.minecraft.world.level.chunk.ChunkStatus.NOISE) {
 +                    either.left().ifPresent(chunk -> net.minecraft.world.level.levelgen.Heightmap.primeHeightmaps(chunk, net.minecraft.world.level.chunk.ChunkStatus.POST_FEATURES));
@@ -89,7 +88,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        // get empty object
 +        OldCraftChunkData data = (OldCraftChunkData) this.createChunkData(world);
 +        // copy over generated sections
-+        data.getLights().addAll(protoChunk.getLights().toList());
 +        data.setRawChunkData(protoChunk.getSections());
 +        // hooray!
 +        return data;
diff --git a/patches/server/Optimise-general-POI-access.patch b/patches/server/Optimise-general-POI-access.patch
index 5ef8bc2e7c..fa0eed7c34 100644
--- a/patches/server/Optimise-general-POI-access.patch
+++ b/patches/server/Optimise-general-POI-access.patch
@@ -1020,7 +1020,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            (BlockPos pos) -> {
 +                net.minecraft.world.level.chunk.ChunkAccess lowest = this.level.getChunk(pos.getX() >> 4, pos.getZ() >> 4, net.minecraft.world.level.chunk.ChunkStatus.EMPTY);
 +                if (!lowest.getStatus().isOrAfter(net.minecraft.world.level.chunk.ChunkStatus.FULL)
-+                    && (lowest.getBelowZeroRetrogen() == null || !lowest.getBelowZeroRetrogen().targetStatus().isOrAfter(net.minecraft.world.level.chunk.ChunkStatus.HEIGHTMAPS))) {
++                    && (lowest.getBelowZeroRetrogen() == null || !lowest.getBelowZeroRetrogen().targetStatus().isOrAfter(net.minecraft.world.level.chunk.ChunkStatus.SPAWN))) {
 +                    // why would we generate the chunk?
 +                    return false;
 +                }
diff --git a/patches/server/Rewrite-chunk-system.patch b/patches/server/Rewrite-chunk-system.patch
index b04ad145a6..29c0c5ab6a 100644
--- a/patches/server/Rewrite-chunk-system.patch
+++ b/patches/server/Rewrite-chunk-system.patch
@@ -3222,9 +3222,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +        private boolean isLoadedChunkGeneratable(final ChunkAccess chunkAccess) {
 +            final BelowZeroRetrogen belowZeroRetrogen;
++            // see PortalForcer#findPortalAround
 +            return chunkAccess != null && (
 +                chunkAccess.getStatus() == ChunkStatus.FULL ||
-+                    ((belowZeroRetrogen = chunkAccess.getBelowZeroRetrogen()) != null && belowZeroRetrogen.targetStatus().isOrAfter(ChunkStatus.FULL))
++                    ((belowZeroRetrogen = chunkAccess.getBelowZeroRetrogen()) != null && belowZeroRetrogen.targetStatus().isOrAfter(ChunkStatus.SPAWN))
 +            );
 +        }
 +
@@ -21194,7 +21195,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    // Paper start - rewrite chunk system
 +    default ChunkAccess syncLoadNonFull(int chunkX, int chunkZ, ChunkStatus status) {
 +        if (status == null || status.isOrAfter(ChunkStatus.FULL)) {
-+            throw new IllegalArgumentException("Status: " + status.getName());
++            throw new IllegalArgumentException("Status: " + status.toString());
 +        }
 +        return this.getChunk(chunkX, chunkZ, status, true);
 +    }