Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-03 23:07:40 +01:00
Code Issues Projects Releases Wiki Activity

Configurable Below Zero Generation

Browse Source 
By: DerFrZocker <derrieple@gmail.com>
This commit is contained in:
CraftBukkit/Spigot 2021-11-28 12:09:29 +11:00
parent 7cfc37b17d
commit 479ce445d6
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
paper-server/patches/sources/net/minecraft/world/level/chunk/storage/ChunkStorage.java.patch
View File

@ -18,7 +18,7 @@
import net.minecraft.world.level.levelgen.structure.LegacyStructureDataHandler; import net.minecraft.world.level.levelgen.structure.LegacyStructureDataHandler;
import net.minecraft.world.level.storage.DimensionDataStorage; import net.minecraft.world.level.storage.DimensionDataStorage;
@@ -39,27 +45,71 @@ @@ -39,27 +45,85 @@
return this.worker.isOldChunkAround(chunkPos, checkRadius); return this.worker.isOldChunkAround(chunkPos, checkRadius);
} }
@ -94,15 +94,29 @@
- ChunkStorage.removeDatafixingContext(nbt); - ChunkStorage.removeDatafixingContext(nbt);
- NbtUtils.addCurrentDataVersion(nbt); - NbtUtils.addCurrentDataVersion(nbt);
- return nbt; - return nbt;
+ // Spigot start - SPIGOT-6806: Quick and dirty way to prevent below zero generation in old chunks, by setting the status to heightmap instead of empty
+ boolean stopBelowZero = false;
+ boolean belowZeroGenerationInExistingChunks = (generatoraccess != null) ? ((ServerLevel) generatoraccess).spigotConfig.belowZeroGenerationInExistingChunks : org.spigotmc.SpigotConfig.belowZeroGenerationInExistingChunks;
+
+ if (i <= 2730 && !belowZeroGenerationInExistingChunks) {
+ stopBelowZero = "full".equals(nbttagcompound.getCompound("Level").getString("Status"));
+ }
+ // Spigot end
+
+ ChunkStorage.injectDatafixingContext(nbttagcompound, resourcekey, optional); + ChunkStorage.injectDatafixingContext(nbttagcompound, resourcekey, optional);
+ nbttagcompound = DataFixTypes.CHUNK.updateToCurrentVersion(this.fixerUpper, nbttagcompound, Math.max(1493, i)); + nbttagcompound = DataFixTypes.CHUNK.updateToCurrentVersion(this.fixerUpper, nbttagcompound, Math.max(1493, i));
+ // Spigot start
+ if (stopBelowZero) {
+ nbttagcompound.putString("Status", net.minecraft.core.registries.BuiltInRegistries.CHUNK_STATUS.getKey(ChunkStatus.SPAWN).toString());
+ }
+ // Spigot end
+ ChunkStorage.removeDatafixingContext(nbttagcompound); + ChunkStorage.removeDatafixingContext(nbttagcompound);
+ NbtUtils.addCurrentDataVersion(nbttagcompound); + NbtUtils.addCurrentDataVersion(nbttagcompound);
+ return nbttagcompound; + return nbttagcompound;
} catch (Exception exception) { } catch (Exception exception) {
CrashReport crashreport = CrashReport.forThrowable(exception, "Updated chunk"); CrashReport crashreport = CrashReport.forThrowable(exception, "Updated chunk");
CrashReportCategory crashreportsystemdetails = crashreport.addCategory("Updated chunk details"); CrashReportCategory crashreportsystemdetails = crashreport.addCategory("Updated chunk details");
@@ -70,7 +120,7 @@ @@ -70,7 +134,7 @@
} }
} }
@ -111,7 +125,7 @@
LegacyStructureDataHandler persistentstructurelegacy = this.legacyStructureHandler; LegacyStructureDataHandler persistentstructurelegacy = this.legacyStructureHandler;
if (persistentstructurelegacy == null) { if (persistentstructurelegacy == null) {
@@ -85,7 +135,7 @@ @@ -85,7 +149,7 @@
return persistentstructurelegacy; return persistentstructurelegacy;
} }

5
paper-server/src/main/java/org/spigotmc/SpigotConfig.java
View File

@ -401,4 +401,9 @@ public class SpigotConfig
private static void disablePlayerDataSaving() { private static void disablePlayerDataSaving() {
SpigotConfig.disablePlayerDataSaving = SpigotConfig.getBoolean("players.disable-saving", false); SpigotConfig.disablePlayerDataSaving = SpigotConfig.getBoolean("players.disable-saving", false);
} }
public static boolean belowZeroGenerationInExistingChunks;
private static void belowZeroGenerationInExistingChunks() {
SpigotConfig.belowZeroGenerationInExistingChunks = SpigotConfig.getBoolean("world-settings.default.below-zero-generation-in-existing-chunks", true);
}
} }

5
paper-server/src/main/java/org/spigotmc/SpigotWorldConfig.java
View File

@ -388,4 +388,9 @@ public class SpigotWorldConfig
{ {
this.thunderChance = this.getInt("thunder-chance", 100000); this.thunderChance = this.getInt("thunder-chance", 100000);
} }
public boolean belowZeroGenerationInExistingChunks;
private void belowZeroGenerationInExistingChunks() {
this.belowZeroGenerationInExistingChunks = this.getBoolean("below-zero-generation-in-existing-chunks", true);
}
} }