From c8a5344a14f65362814f46c45b57379685b7fe88 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Wed, 10 Aug 2022 09:33:23 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@22ad9ee Fix command pool submitting on shutdown (#8272) PaperMC/Paper@954b3fb Send signature headers when chat event viewers are modified PaperMC/Paper@2cab696 Don't manually send ClientboundPlayerPositionPacket for refreshPlayer --- gradle.properties | 2 +- .../server/0050-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 f558080f3..5c6bded90 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.purpurmc.purpur version = 1.19.2-R0.1-SNAPSHOT -paperCommit = e6f8284125dc98a64025edd6ac11899ca8e7f3e5 +paperCommit = 2cab6963a7a085ce2de972bf9905e3d5ceab23a8 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0050-Skip-events-if-there-s-no-listeners.patch b/patches/server/0050-Skip-events-if-there-s-no-listeners.patch index 5439719db..d52ac5fb7 100644 --- a/patches/server/0050-Skip-events-if-there-s-no-listeners.patch +++ b/patches/server/0050-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 135b341e5b975fc542f66ef9c52e29f4c6dd4a53..18edc532315301abe2e0920da496aafd68627fe8 100644 +index 7c96f7fc5997761426a0c62cad0cab5cc668f282..98664c95331cee4139711c402dfaf406ee672c22 100644 --- a/src/main/java/net/minecraft/commands/Commands.java +++ b/src/main/java/net/minecraft/commands/Commands.java -@@ -414,6 +414,7 @@ public class Commands { +@@ -415,6 +415,7 @@ public class Commands { } private void runSync(ServerPlayer player, Collection bukkit, RootCommandNode rootcommandnode) { @@ -16,7 +16,7 @@ index 135b341e5b975fc542f66ef9c52e29f4c6dd4a53..18edc532315301abe2e0920da496aafd // Paper end - Async command map building new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent(player.getBukkitEntity(), (RootCommandNode) rootcommandnode, false).callEvent(); // Paper PlayerCommandSendEvent event = new PlayerCommandSendEvent(player.getBukkitEntity(), new LinkedHashSet<>(bukkit)); -@@ -426,6 +427,7 @@ public class Commands { +@@ -427,6 +428,7 @@ public class Commands { } } // CraftBukkit end