Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@8f736dbf Improve outdated version check (#12589)
PaperMC/Paper@3ebc5b33 Don't apply oversized sanitizers in components disabled by config (#13466)
This commit is contained in:
granny
2026-01-03 18:30:46 -08:00
parent 631e6e7e13
commit 56a7d46279
9 changed files with 188 additions and 101 deletions

View File

@@ -5,10 +5,10 @@ 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
index e47f279b66b169e2cdf762bb739a261f2acebeb1..cc1906ef871de6a4ff82039d8ddfcd764139f37d 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 {
@@ -303,6 +303,7 @@ public class GlobalConfiguration extends ConfigurationPart {
}
}
@@ -16,7 +16,7 @@ index c52d2530f6bfd601e8af8fd6713e6870cf5611d3..c95bca1a3100952fb02a7bff46fcf915
public Misc misc;
public class Misc extends ConfigurationPart {
@@ -346,6 +347,7 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -349,6 +350,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.")