From ecbaa9cb92d15317d16937abd6e3caba65625dab Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Tue, 13 Aug 2024 00:13:08 +0000 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@4a97ba3 Fix `setSendViewDistance`'s return (#11247) PaperMC/Paper@1798e94 Fix BasicCommand suggestion arg count (#11241) PaperMC/Paper@7c9240f Improve standard messenger logging --- gradle.properties | 2 +- patches/server/0067-Reduce-array-allocations.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9050e56..a8cf03a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=org.galemc.gale version=1.21.1-R0.1-SNAPSHOT mcVersion=1.21.1 -paperRef=f97aff74b6f7fd4940c0c0b6cca3f8ac6e1afdef +paperRef=7c9240f4a63b13be1fdcedbfb0270f9b49b75518 org.gradle.caching=false org.gradle.parallel=true diff --git a/patches/server/0067-Reduce-array-allocations.patch b/patches/server/0067-Reduce-array-allocations.patch index 6dc6e5d..74c8da0 100644 --- a/patches/server/0067-Reduce-array-allocations.patch +++ b/patches/server/0067-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 da50ca4c6524e4f99ea4de2157d7ef900178d0f1..30869359911d3c53d8ee589376fc6efdf95e5ae8 100644 +index 95d3b42cbe2184b0a04d941f27f7a6e643ef59be..e0dad3b61402b309084a464bc3dfdb80043e69eb 100644 --- a/src/main/java/io/papermc/paper/command/brigadier/PaperCommands.java +++ b/src/main/java/io/papermc/paper/command/brigadier/PaperCommands.java -@@ -189,7 +189,7 @@ public class PaperCommands implements Commands, PaperRegistrar {