aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0822-Don-t-broadcast-messages-to-command-blocks.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0822-Don-t-broadcast-messages-to-command-blocks.patch')
-rw-r--r--patches/server/0822-Don-t-broadcast-messages-to-command-blocks.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/patches/server/0822-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0822-Don-t-broadcast-messages-to-command-blocks.patch
new file mode 100644
index 0000000000..d009bb5b66
--- /dev/null
+++ b/patches/server/0822-Don-t-broadcast-messages-to-command-blocks.patch
@@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Thu, 16 Jun 2022 14:22:56 -0700
+Subject: [PATCH] Don't broadcast messages to command blocks
+
+Previously the broadcast method would update the last output
+in command blocks, and if called asynchronously, would throw
+an error
+
+diff --git a/src/main/java/net/minecraft/world/level/BaseCommandBlock.java b/src/main/java/net/minecraft/world/level/BaseCommandBlock.java
+index e05eb08a9c229b371887676da510df948b896a85..ceeedbd88c56c08ec8b047c9ca2f14cc581e12ad 100644
+--- a/src/main/java/net/minecraft/world/level/BaseCommandBlock.java
++++ b/src/main/java/net/minecraft/world/level/BaseCommandBlock.java
+@@ -172,6 +172,7 @@ public abstract class BaseCommandBlock implements CommandSource {
+ @Override
+ public void sendSystemMessage(Component message) {
+ if (this.trackOutput) {
++ org.spigotmc.AsyncCatcher.catchOp("sendSystemMessage to a command block"); // Paper
+ SimpleDateFormat simpledateformat = BaseCommandBlock.TIME_FORMAT;
+ Date date = new Date();
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+index c1229e3ce355fb324a0fe0c37b4d39fbdc60c7a3..a148d03d746d4580777e1e193c07dad922a080e0 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+@@ -1777,7 +1777,7 @@ public final class CraftServer implements Server {
+ // Paper end
+ Set<CommandSender> recipients = new HashSet<>();
+ for (Permissible permissible : this.getPluginManager().getPermissionSubscriptions(permission)) {
+- if (permissible instanceof CommandSender && permissible.hasPermission(permission)) {
++ if (permissible instanceof CommandSender && !(permissible instanceof org.bukkit.command.BlockCommandSender) && permissible.hasPermission(permission)) { // Paper - don't broadcast to BlockCommandSender (specifically Command Blocks)
+ recipients.add((CommandSender) permissible);
+ }
+ }