From f2b35933952685545de253a0397a289dd66df1ce Mon Sep 17 00:00:00 2001 From: granny Date: Tue, 14 Jan 2025 12:24:22 -0800 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@c44f891 Fix PlayerUseUnknownEntityEvent jd (#11969) PaperMC/Paper@85d0040 [ci skip] Fix getTemperature javadocs (#11967) PaperMC/Paper@e82f7e6 [ci skip] Fix Inventory#setMaxStackSize jd (#11968) PaperMC/Paper@9f74858 [ci skip] Cleanup test plugin PaperMC/Paper@eeec611 Fix zombie villager infection chance hunk (#11974) PaperMC/Paper@209e5f8 Readd dropped hunk for ender dragon fight data (#11975) PaperMC/Paper@8e80d4e Correctly construct StructureManager --- gradle.properties | 2 +- .../files/src/main/java/org/bukkit/World.java.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index a121c72a3..83fd6c8a8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.purpurmc.purpur version = 1.21.4-R0.1-SNAPSHOT mcVersion = 1.21.4 -paperCommit = fe75eaf09a22a5cc46877edb714274638d3b111f +paperCommit = 8e80d4e15852ffbed1a18d1e9b34550191433200 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 2fb8c1498..fdf48a291 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 -@@ -4244,6 +_,86 @@ +@@ -4238,6 +_,86 @@ @Nullable public DragonBattle getEnderDragonBattle();