SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests Aktivität

Fix final compilation issues

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Spottedleaf 2023-06-08 16:35:02 -07:00
Ursprung 494b03ea47
Commit c7006765bd
3 geänderte Dateien mit 6 neuen und 7 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

6
patches/server/Allow-delegation-to-vanilla-chunk-gen.patch
Datei anzeigen

@ -21,8 +21,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ net.minecraft.world.level.chunk.ChunkStatus.NOISE, + net.minecraft.world.level.chunk.ChunkStatus.NOISE,
+ net.minecraft.world.level.chunk.ChunkStatus.SURFACE, + net.minecraft.world.level.chunk.ChunkStatus.SURFACE,
+ net.minecraft.world.level.chunk.ChunkStatus.CARVERS, + 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.FEATURES,
+ net.minecraft.world.level.chunk.ChunkStatus.INITIALIZE_LIGHT,
+ net.minecraft.world.level.chunk.ChunkStatus.LIGHT + net.minecraft.world.level.chunk.ChunkStatus.LIGHT
+ ); + );
+ +
@ -77,8 +77,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ chunk -> { + chunk -> {
+ throw new UnsupportedOperationException("Not creating full chunks here"); + throw new UnsupportedOperationException("Not creating full chunks here");
+ }, + },
+ chunks, + chunks
+ true
+ ).thenAccept(either -> { + ).thenAccept(either -> {
+ if (chunkStatus == net.minecraft.world.level.chunk.ChunkStatus.NOISE) { + 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)); + 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 + // get empty object
+ OldCraftChunkData data = (OldCraftChunkData) this.createChunkData(world); + OldCraftChunkData data = (OldCraftChunkData) this.createChunkData(world);
+ // copy over generated sections + // copy over generated sections
+ data.getLights().addAll(protoChunk.getLights().toList());
+ data.setRawChunkData(protoChunk.getSections()); + data.setRawChunkData(protoChunk.getSections());
+ // hooray! + // hooray!
+ return data; + return data;

2
patches/server/Optimise-general-POI-access.patch
Datei anzeigen

@ -1020,7 +1020,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ (BlockPos pos) -> { + (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); + 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) + 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? + // why would we generate the chunk?
+ return false; + return false;
+ } + }

5
patches/server/Rewrite-chunk-system.patch
Datei anzeigen

@ -3222,9 +3222,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ +
+ private boolean isLoadedChunkGeneratable(final ChunkAccess chunkAccess) { + private boolean isLoadedChunkGeneratable(final ChunkAccess chunkAccess) {
+ final BelowZeroRetrogen belowZeroRetrogen; + final BelowZeroRetrogen belowZeroRetrogen;
+ // see PortalForcer#findPortalAround
+ return chunkAccess != null && ( + return chunkAccess != null && (
+ chunkAccess.getStatus() == ChunkStatus.FULL || + 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 + // Paper start - rewrite chunk system
+ default ChunkAccess syncLoadNonFull(int chunkX, int chunkZ, ChunkStatus status) { + default ChunkAccess syncLoadNonFull(int chunkX, int chunkZ, ChunkStatus status) {
+ if (status == null || status.isOrAfter(ChunkStatus.FULL)) { + 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); + return this.getChunk(chunkX, chunkZ, status, true);
+ } + }