mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-06-21 17:57:50 +02:00
39 lines
2.7 KiB
Diff
39 lines
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: granny <contact@granny.dev>
|
|
Date: Mon, 8 Dec 2025 15:44:50 -0800
|
|
Subject: [PATCH] Setting to reintroduce end void rings
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
|
|
index 232bc5e8b7cbb528b96f8048ba683705cddc436e..7d2b38ecf1478c9e53d033f41c4184864c8d32e4 100644
|
|
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
|
|
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
|
|
@@ -292,6 +292,7 @@ public class GlobalConfiguration extends ConfigurationPart {
|
|
}
|
|
}
|
|
|
|
+ @Setting(org.purpurmc.purpur.configuration.transformation.FarEndTerrainGenerationMigration.MISC_KEY) // Purpur - Migrate Setting to reintroduce end void rings
|
|
public Misc misc;
|
|
|
|
public class Misc extends ConfigurationPart {
|
|
@@ -338,6 +339,7 @@ public class GlobalConfiguration extends ConfigurationPart {
|
|
@Comment("Whether the nether dimension is enabled and will be loaded.")
|
|
public boolean enableNether = true;
|
|
@Comment("Keeps Paper's fix for MC-159283 enabled. Disable to use vanilla End ring terrain.")
|
|
+ @Setting(org.purpurmc.purpur.configuration.transformation.FarEndTerrainGenerationMigration.FIX_FAR_END_TERRAIN_GENERATION_KEY) // Purpur - Migrate Setting to reintroduce end void rings
|
|
public boolean fixFarEndTerrainGeneration = true;
|
|
@Comment("Fix for MC-301114. This removes the oldest combat entry when it hits the cap, to fix a memory leak on constant entity damage.")
|
|
public IntOr.Disabled maxTrackingCombatEntries = new IntOr.Disabled(OptionalInt.of(10240));
|
|
diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
|
|
index aa5ff7fb46b068fcb27abfdcb81f10220c5d1e89..cb9b2b6878e8ca9e3baba341550a860176271013 100644
|
|
--- a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
|
|
+++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
|
|
@@ -292,6 +292,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
|
|
for (NodePath path : RemovedConfigurations.REMOVED_GLOBAL_PATHS) {
|
|
builder.addAction(path, TransformAction.remove());
|
|
}
|
|
+ org.purpurmc.purpur.configuration.transformation.FarEndTerrainGenerationMigration.apply(builder); // Purpur - Migrate Setting to reintroduce end void rings
|
|
builder.build().apply(node);
|
|
|
|
final ConfigurationTransformation.VersionedBuilder versionedBuilder = Transformations.versionedBuilder();
|