From 224e7c7987d7b5b16379f5cd072b3e1a639c06db Mon Sep 17 00:00:00 2001 From: granny Date: Fri, 31 May 2024 14:47:30 -0700 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@0513374 Fire TabCompleteEvent for legacy commands (#10834) --- gradle.properties | 2 +- patches/server/0254-Remove-Timings.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index b2b30e565..a6c720dd7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.purpurmc.purpur version = 1.20.6-R0.1-SNAPSHOT mcVersion = 1.20.6 -paperCommit = 3181470ad7d372d2a799c3dcdb61e9392969abe4 +paperCommit = 0513374b1f3410c2dd630f169a0cdf64a349500e org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0254-Remove-Timings.patch b/patches/server/0254-Remove-Timings.patch index d285248f3..7b4e4f3cd 100644 --- a/patches/server/0254-Remove-Timings.patch +++ b/patches/server/0254-Remove-Timings.patch @@ -43,10 +43,10 @@ index 56b07a3306e5735816c8d89601b519cb0db6379a..604de7aed6db44c9c84d541765e57da4 return executedUnloadTask | canSaveChunk | canSaveEntities | canSavePOI ? new SaveStat(executedUnloadTask || canSaveChunk, canSaveEntities, canSavePOI): null; } diff --git a/src/main/java/io/papermc/paper/command/brigadier/bukkit/BukkitCommandNode.java b/src/main/java/io/papermc/paper/command/brigadier/bukkit/BukkitCommandNode.java -index 10a113b057b0a4d27cce3bae975e1108aaa7b517..02597f890ac7f2dc12c94c283356b8309638dd17 100644 +index 0c3c82b28e581286b798ee58ca4193efc2faff4a..24121a43aeb5e9bce013f30c92dddd15f99736c6 100644 --- a/src/main/java/io/papermc/paper/command/brigadier/bukkit/BukkitCommandNode.java +++ b/src/main/java/io/papermc/paper/command/brigadier/bukkit/BukkitCommandNode.java -@@ -75,16 +75,16 @@ public class BukkitCommandNode extends LiteralCommandNode { +@@ -80,16 +80,16 @@ public class BukkitCommandNode extends LiteralCommandNode { // Plugins do weird things to workaround normal registration if (this.command.timings == null) {