From 0c9140aff1fac81adb2edae1dc75cc8b069b8c3b Mon Sep 17 00:00:00 2001 From: granny Date: Fri, 15 Aug 2025 21:01:28 -0700 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@86b716bc Fix BlockFadeEvent not being called when fire extinguishes in rain (#12972) PaperMC/Paper@f0c1f856 Fix Phantom entity Spawn reason (#12980) PaperMC/Paper@651fa124 Fix cancelled EnderDragonShootFireballEvent playing sound (#12977) PaperMC/Paper@2456ff26 [ci/skip] Update javadoc for tinted leaves particle (#12962) PaperMC/Paper@a743e6b1 [ci/skip] Clarify tab completion ordering in event jd (#12965) PaperMC/Paper@a22447a5 Added getWorldPath to World API (#12952) PaperMC/Paper@b200237c Fix clone return for Paper PlayerProfile (#12984) --- gradle.properties | 2 +- .../files/src/main/java/org/bukkit/World.java.patch | 2 +- .../src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 4e8957ac9..b9ecb8d52 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.purpurmc.purpur version = 1.21.8-R0.1-SNAPSHOT mcVersion = 1.21.8 -paperCommit = 4fe66e5800114214249c4e64a4ee74b3847e39a2 +paperCommit = b200237c7d9b843995f23ba1beae0899ef54ae72 org.gradle.configuration-cache = true org.gradle.caching = true diff --git a/purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch index 3854c7295..9c3ee2528 100644 --- a/purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch +++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -4308,6 +_,86 @@ +@@ -4319,6 +_,86 @@ @Nullable public DragonBattle getEnderDragonBattle(); diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch index 02a4ab200..8afd63868 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2375,6 +_,50 @@ +@@ -2376,6 +_,50 @@ return (this.getHandle().getDragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().getDragonFight()); }