mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-20 19:33:32 +02:00
35 lines
2.1 KiB
Diff
35 lines
2.1 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||
|
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 c0195f73cd2c8721e882c681eaead65471710081..861b348f73867af3199f1cc0dab1ddd4241d1567 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 f1e5ccfbcd08a73ac3aba9a1cb7b414faef81f9e..72311b27bb642ee05dba45b76935277d183012eb 100644
|
||
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||
|
@@ -1736,7 +1736,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);
|
||
|
}
|
||
|
}
|