mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix final compilation issues

Browse source
This commit is contained in:
Spottedleaf 2023-06-08 16:35:02 -07:00
parent 494b03ea47
commit c7006765bd
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
patches/server/Rewrite-chunk-system.patch
View file

@ -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);
+ }