mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 08:27:43 +01:00
c51992977f
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@15309f9a Update to 1.21.11-rc2 PaperMC/Paper@f34efdb7 Pass SWEEP_ATTACK knockback reason PaperMC/Paper@eb37433d Re-add configurable combat exhaustion and event PaperMC/Paper@31af44d2 Re-add dropped hunk for visibility sounds PaperMC/Paper@252cfe14 Fix unnecessary player info remove packets being sent when hiding players (#12587) PaperMC/Paper@62dc8b32 Use book packet for both methods (#13298) PaperMC/Paper@7fdc16a8 Add configuration option to control fix for MC-159283 end rings (#13363) PaperMC/Paper@bb6c2d08 Use correct addresses for PlayerConnection (#13307) PaperMC/Paper@f08aad23 [ci/skip] Clarify Metadata API deprecation message (#13371) PaperMC/Paper@5f03e110 Fix isInteractable for copper chests (#13325) PaperMC/Paper@a339457c Readd dropped shulker box block hunk PaperMC/Paper@843cafd8 Update to 1.21.11-rc3 PaperMC/Paper@7db609b0 [ci/skip] diff housekeeping PaperMC/Paper@f6e937b9 Reimplement int based gamerule access (#13372)
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 c52d2530f6bfd601e8af8fd6713e6870cf5611d3..c95bca1a3100952fb02a7bff46fcf9155b185a80 100644
|
|
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
|
|
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
|
|
@@ -300,6 +300,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 {
|
|
@@ -346,6 +347,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 e0491ef5cfc06b5c23d448b8c9679a17e58bca26..0d3d9bd2f6aa1284dc237b5169372a2431c85fb8 100644
|
|
--- a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
|
|
+++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
|
|
@@ -291,6 +291,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();
|