mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-04-21 18:58:16 +02:00
cd3e87344d
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@0a3a73c1 Fix fireball entity class (#13676) PaperMC/Paper@0026eacf Remove unused config for `logging.deobfuscate-stacktraces` (#13778) PaperMC/Paper@392e594c Fix EntityLungeEvent#setLungePower being ignored (#13784) PaperMC/Paper@144a7c7f Add missing deprecation for Material#getCreativeCategory (#13686) PaperMC/Paper@0c79f00b Improve GameRule API (#13668) PaperMC/Paper@c58cba39 Port blockstate validation patch (#13786) PaperMC/Paper@04ee8eac Remove Paper config unsupported-settings.compression-format (#13800) PaperMC/Paper@dd0810c4 Skip inactive AI ticks for unaware mobs (#13781) PaperMC/Paper@d0be5e20 Call BlockFadeEvent for FrostedIce (#13764) PaperMC/Paper@66d3bbed Update frosted ice patch for 26.1
39 lines
2.4 KiB
Diff
39 lines
2.4 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 569b46cce9d5207380a9391e969e3a6aa790717b..a0cf70f1ccbb78f058e8ac5fc95bcb5b03300cdc 100644
|
|
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
|
|
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
|
|
@@ -288,6 +288,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 {
|
|
@@ -334,6 +335,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;
|
|
}
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
|
|
index cae151f0c6ecfc0dee3c2f7df29fd2bef075b74f..6df4d6fe4bb9906127d266c156973ac777cae56d 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();
|