From ed44787067c48e3eb4e8014db454fd050e54fb46 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Wed, 31 Jul 2024 00:19:39 +0000 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@227544c Move TickThread changes from Moonrise patch to MCUtils PaperMC/Paper@67d414a Allow plugin aliases to override vanilla commands (#11186) PaperMC/Paper@58c7ea3 Preserve command node when re-registering modern commands through old API (#11184) --- gradle.properties | 2 +- patches/server/0066-Reduce-array-allocations.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 71ce02e..2d7411c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=org.galemc.gale version=1.21-R0.1-SNAPSHOT mcVersion=1.21 -paperRef=100d75a11ced7fdd895a912779773d044840b2a4 +paperRef=58c7ea3193c5c192fb09b0197b86f0ff5dbe2dfd org.gradle.caching=false org.gradle.parallel=true diff --git a/patches/server/0066-Reduce-array-allocations.patch b/patches/server/0066-Reduce-array-allocations.patch index b4d6e2f..5d7e28c 100644 --- a/patches/server/0066-Reduce-array-allocations.patch +++ b/patches/server/0066-Reduce-array-allocations.patch @@ -129,10 +129,10 @@ index 673103f160cbe577c6e05f998706af4e6850011b..2c1eb34f1539555ba1988a2eeeea7b2f @org.jetbrains.annotations.NotNull diff --git a/src/main/java/io/papermc/paper/command/brigadier/PaperCommands.java b/src/main/java/io/papermc/paper/command/brigadier/PaperCommands.java -index a3e128bde0fa4ab0ecab4172f02288a29b9fddc7..cbbb95692e47217932b5990057483589e8080f69 100644 +index da50ca4c6524e4f99ea4de2157d7ef900178d0f1..30869359911d3c53d8ee589376fc6efdf95e5ae8 100644 --- a/src/main/java/io/papermc/paper/command/brigadier/PaperCommands.java +++ b/src/main/java/io/papermc/paper/command/brigadier/PaperCommands.java -@@ -185,7 +185,7 @@ public class PaperCommands implements Commands, PaperRegistrar {