Skip to content

Commit a2a42c5

Browse files
authored
Correctly consume chunkStatus in loadChunksAsync (#14220)
Reintroduce a missing patch hunk from moonrise which consumes the added chunk status parameter in ServerLevel#loadChunksAsync.
1 parent 1797fbc commit a2a42c5

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

paper-server/patches/features/0001-Moonrise-optimisation-patches.patch

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27403,7 +27403,7 @@ index f11c5ea1ee9381e7bf65305b959bd7da67423ece..26822e1211194b411dd8ea75ce523133
2740327403
List<Entity> passengers = this.entity.getPassengers();
2740427404
if (!passengers.equals(this.lastPassengers)) {
2740527405
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
27406-
index 473feb1aa6ccf0f03ce0bc895de367b3e554e1bc..e5328f08d6a323aa1307ed791a88916b4588939c 100644
27406+
index 473feb1aa6ccf0f03ce0bc895de367b3e554e1bc..4fce291cb7cd6eb2f4e47237fe247a5d666da0ad 100644
2740727407
--- a/net/minecraft/server/level/ServerLevel.java
2740827408
+++ b/net/minecraft/server/level/ServerLevel.java
2740927409
@@ -182,7 +182,7 @@ import net.minecraft.world.waypoints.WaypointTransmitter;
@@ -27626,7 +27626,13 @@ index 473feb1aa6ccf0f03ce0bc895de367b3e554e1bc..e5328f08d6a323aa1307ed791a88916b
2762627626
}
2762727627
}
2762827628
}
27629-
@@ -340,16 +476,135 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
27629+
@@ -335,21 +471,140 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
27630+
for (int cx = minChunkX; cx <= maxChunkX; ++cx) {
27631+
for (int cz = minChunkZ; cz <= maxChunkZ; ++cz) {
27632+
ca.spottedleaf.moonrise.common.PlatformHooks.get().scheduleChunkLoad(
27633+
- this, cx, cz, net.minecraft.world.level.chunk.status.ChunkStatus.FULL, true, priority, consumer
27634+
+ this, cx, cz, chunkStatus, true, priority, consumer
27635+
);
2763027636
}
2763127637
}
2763227638
}

0 commit comments

Comments
 (0)