From ff7c6beeb6c2ca9386f08e314fddaad7703b10d4 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Wed, 20 Aug 2025 04:33:36 +0800 Subject: [PATCH] Updated Upstream (Paper/Purpur) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@f866a5fd Use LinkedHashMap in ChannelInitializeListenerHolder (#13000) Purpur Changes: PurpurMC/Purpur@6c88d740 Updated Upstream (Paper) PurpurMC/Purpur@520a7e50 Updated Upstream (Paper) PurpurMC/Purpur@c29e75fe Updated Upstream (Paper) PurpurMC/Purpur@254407da Updated Upstream (Paper) PurpurMC/Purpur@3850f35c Updated Upstream (Paper) PurpurMC/Purpur@710ecf5e Updated Upstream (Paper) PurpurMC/Purpur@4fd4df07 Updated Upstream (Paper) PurpurMC/Purpur@0c9140af Updated Upstream (Paper) --- gradle.properties | 2 +- leaf-api/paper-patches/features/0011-Purpur-API-Changes.patch | 2 +- .../features/0093-Purpur-Server-Minecraft-Changes.patch | 2 +- .../features/0008-Purpur-Server-Paper-Changes.patch | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 19ace499..8b6b9c1e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=cn.dreeam.leaf mcVersion=1.21.8 version=1.21.8-R0.1-SNAPSHOT -paperCommit=616a8795ea34c6ed8ee427d7558d51b073128ab3 +paperCommit=f866a5fd5497798590aebefb99e417c97a8e1e76 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/leaf-api/paper-patches/features/0011-Purpur-API-Changes.patch b/leaf-api/paper-patches/features/0011-Purpur-API-Changes.patch index 35f4c6b7..3015227b 100644 --- a/leaf-api/paper-patches/features/0011-Purpur-API-Changes.patch +++ b/leaf-api/paper-patches/features/0011-Purpur-API-Changes.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Purpur API Changes Original license: MIT Original project: https://github.com/PurpurMC/Purpur -Commit: 5053eb0c5dc9662ffb39ae7c39c6ca08c013d898 +Commit: 0c9140aff1fac81adb2edae1dc75cc8b069b8c3b Patches listed below are removed in this patch, They exists in Gale or Leaf: * "co/aikar/timings/TimedEventExecutor.java.patch" diff --git a/leaf-server/minecraft-patches/features/0093-Purpur-Server-Minecraft-Changes.patch b/leaf-server/minecraft-patches/features/0093-Purpur-Server-Minecraft-Changes.patch index 6850f0c3..a119e245 100644 --- a/leaf-server/minecraft-patches/features/0093-Purpur-Server-Minecraft-Changes.patch +++ b/leaf-server/minecraft-patches/features/0093-Purpur-Server-Minecraft-Changes.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Purpur Server Minecraft Changes Original license: MIT Original project: https://github.com/PurpurMC/Purpur -Commit: 5053eb0c5dc9662ffb39ae7c39c6ca08c013d898 +Commit: 0c9140aff1fac81adb2edae1dc75cc8b069b8c3b Patches listed below are removed in this patch, They exists in Gale or Leaf: * "net/minecraft/CrashReport.java.patch" diff --git a/leaf-server/paper-patches/features/0008-Purpur-Server-Paper-Changes.patch b/leaf-server/paper-patches/features/0008-Purpur-Server-Paper-Changes.patch index 1da76693..ae2f7c22 100644 --- a/leaf-server/paper-patches/features/0008-Purpur-Server-Paper-Changes.patch +++ b/leaf-server/paper-patches/features/0008-Purpur-Server-Paper-Changes.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Purpur Server Paper Changes Original license: MIT Original project: https://github.com/PurpurMC/Purpur -Commit: 5053eb0c5dc9662ffb39ae7c39c6ca08c013d898 +Commit: 0c9140aff1fac81adb2edae1dc75cc8b069b8c3b Patches listed below are removed in this patch, They exists in Gale or Leaf: * "Rebrand.patch"