From 96d7ef7a0329e0c114f2993032d4ac6426445f3b Mon Sep 17 00:00:00 2001 From: granny Date: Fri, 29 Nov 2024 20:52:59 -0800 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@64828f3 Clean up thread pool usage (#11681) PaperMC/Paper@5ab6789 Copy dispatcher root children before passing it into async tree building PaperMC/Paper@47f2071 Deprecate ChatVisibility#UNKNOWN (#11683) --- gradle.properties | 2 +- .../server/0042-Skip-events-if-there-s-no-listeners.patch | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index f4621118c..504c13c12 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.purpurmc.purpur version = 1.21.3-R0.1-SNAPSHOT mcVersion = 1.21.3 -paperCommit = 9953384d89548c0c53a57e2a60abace9ad19b177 +paperCommit = 47f207135044e8835c529561d0d0029f0ae3fba8 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0042-Skip-events-if-there-s-no-listeners.patch b/patches/server/0042-Skip-events-if-there-s-no-listeners.patch index 6b7b6c182..4dc7794a1 100644 --- a/patches/server/0042-Skip-events-if-there-s-no-listeners.patch +++ b/patches/server/0042-Skip-events-if-there-s-no-listeners.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Skip events if there's no listeners diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java -index 260350422fc724ba5cd5769cbb387b6007f36a84..b7783480cc6a51a1f18789b7f3fc35faf5573f8d 100644 +index 5f3669e3eb371d65dd27c37053d4bc5640d93774..bb82e6519e6f1a6a8d87fb6293681fe32b39a6a1 100644 --- a/src/main/java/net/minecraft/commands/Commands.java +++ b/src/main/java/net/minecraft/commands/Commands.java -@@ -514,6 +514,7 @@ public class Commands { +@@ -511,6 +511,7 @@ public class Commands { private void runSync(ServerPlayer player, Collection bukkit, RootCommandNode rootcommandnode) { // Paper end - Perf: Async command map building new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent(player.getBukkitEntity(), (RootCommandNode) rootcommandnode, true).callEvent(); // Paper - Brigadier API @@ -16,7 +16,7 @@ index 260350422fc724ba5cd5769cbb387b6007f36a84..b7783480cc6a51a1f18789b7f3fc35fa PlayerCommandSendEvent event = new PlayerCommandSendEvent(player.getBukkitEntity(), new LinkedHashSet<>(bukkit)); event.getPlayer().getServer().getPluginManager().callEvent(event); -@@ -524,6 +525,7 @@ public class Commands { +@@ -521,6 +522,7 @@ public class Commands { } } // CraftBukkit end