From 71ae86201416eefe91ee6d8fb1494ef63588ece4 Mon Sep 17 00:00:00 2001 From: granny Date: Sun, 12 Apr 2026 12:53:22 -0700 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@75bbf4fb Fix infinite loop for legacy wrapper (#13659) PaperMC/Paper@c58f8443 Check for valid NamespacedKey in OldEnum#valueOf (#13596) PaperMC/Paper@3f5728e2 Cleanup CLI args (#13646) PaperMC/Paper@bd74bf65 feat: PlayerSwapWithEquipmentSlotEvent (#13687) PaperMC/Paper@28f8027a 26.1 PaperMC/Paper@a0eb01aa Change world storage layout to be closer to vanilla & implement migration (#13736) PaperMC/Paper@98012219 Implement new version schema: `.build.-` / `.local-SNAPSHOT` PaperMC/Paper@79ad7f65 Update unpick definitions PaperMC/Paper@5e9a9188 Lazy set Entity.projectileSource in AbstractProjectile#getShooter PaperMC/Paper@9d2db142 Cache the climbing check in activation range (#12764) PaperMC/Paper@7e34fba0 feat: Optimize ServerWaypointManager when locator bar is disabled PaperMC/Paper@bc8f5928 Fix attack check PaperMC/Paper@6a992682 Add PlayerToggleEntityAgeLockEvent (#13742) PaperMC/Paper@870df9d3 [ci/skip] Drop stale TODO PaperMC/Paper@8650896c handle legacy uid in vanilla migration and always write metadata during migration PaperMC/Paper@7c923b72 [ci/skip] migrate remaining patches to jspecify PaperMC/Paper@7773669d [ci/skip] Update README and CONTRIBUTING for 26.1 (#13739) --- gradle.properties | 2 +- .../files/src/main/java/org/bukkit/entity/Villager.java.patch | 2 +- .../files/src/main/java/org/bukkit/entity/Wolf.java.patch | 2 +- .../files/src/main/java/org/bukkit/craftbukkit/Main.java.patch | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8efd54699..31e97fe50 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ group = org.purpurmc.purpur mcVersion = 26.1.1 apiVersion = 26.1.1 channel=EXPERIMENTAL -paperCommit = 77c0866f5f60a74f475e94612a391b22df5cefe3 +paperCommit = 7773669d2ba9554e817b12c546ec58aa876d3bb4 org.gradle.configuration-cache = true org.gradle.caching = true diff --git a/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Villager.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Villager.java.patch index d0195d43a..38751e7e0 100644 --- a/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Villager.java.patch +++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Villager.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/entity/Villager.java +++ b/src/main/java/org/bukkit/entity/Villager.java -@@ -402,4 +_,13 @@ +@@ -405,4 +_,13 @@ * Demand is still updated even if all events are canceled. */ public void restock(); diff --git a/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Wolf.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Wolf.java.patch index f084d77da..f358fb5b3 100644 --- a/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Wolf.java.patch +++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Wolf.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/entity/Wolf.java +++ b/src/main/java/org/bukkit/entity/Wolf.java -@@ -104,6 +_,22 @@ +@@ -105,6 +_,22 @@ */ void setSoundVariant(@NotNull SoundVariant soundVariant); diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/Main.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/Main.java.patch index 90b5a610d..49802a905 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/Main.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/Main.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -169,6 +_,14 @@ +@@ -139,6 +_,14 @@ .defaultsTo(new File[] {}) .describedAs("Plugin directory");