Updated Upstream (Paper)

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
This commit is contained in:
granny
2026-04-19 18:16:36 -07:00
parent 28ce941fa2
commit cd3e87344d
10 changed files with 27 additions and 27 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 e47f279b66b169e2cdf762bb739a261f2acebeb1..cc1906ef871de6a4ff82039d8ddfcd764139f37d 100644
index 569b46cce9d5207380a9391e969e3a6aa790717b..a0cf70f1ccbb78f058e8ac5fc95bcb5b03300cdc 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -303,6 +303,7 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -288,6 +288,7 @@ public class GlobalConfiguration extends ConfigurationPart {
}
}
@@ -16,7 +16,7 @@ index e47f279b66b169e2cdf762bb739a261f2acebeb1..cc1906ef871de6a4ff82039d8ddfcd76
public Misc misc;
public class Misc extends ConfigurationPart {
@@ -349,6 +350,7 @@ public class GlobalConfiguration 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.")

View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1920,6 +_,52 @@
@@ -1902,6 +_,52 @@
return (this.getHandle().getDragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().getDragonFight());
}