2 files changed, 18 insertions, 3 deletions
diff --git a/spark-common/src/main/java/me/lucko/spark/common/SparkPlatform.java b/spark-common/src/main/java/me/lucko/spark/common/SparkPlatform.java
index c93b876..a087fc9 100644
--- a/spark-common/src/main/java/me/lucko/spark/common/SparkPlatform.java
+++ b/spark-common/src/main/java/me/lucko/spark/common/SparkPlatform.java
@@ -94,6 +94,7 @@ public class SparkPlatform {
     private final String viewerUrl;
     private final OkHttpClient httpClient;
     private final BytebinClient bytebinClient;
+    private final boolean disableResponseBroadcast;
     private final List<CommandModule> commandModules;
     private final List<Command> commands;
     private final ReentrantLock commandExecuteLock = new ReentrantLock(true);
@@ -118,6 +119,8 @@ public class SparkPlatform {
         this.httpClient = new OkHttpClient();
         this.bytebinClient = new BytebinClient(this.httpClient, bytebinUrl, "spark-plugin");
 
+        this.disableResponseBroadcast = this.configuration.getBoolean("disableResponseBroadcast", false);
+
         this.commandModules = ImmutableList.of(
                 new SamplerModule(),
                 new HealthModule(),
@@ -216,6 +219,10 @@ public class SparkPlatform {
         return this.bytebinClient;
     }
 
+    public boolean shouldBroadcastResponse() {
+        return !this.disableResponseBroadcast;
+    }
+
     public List<Command> getCommands() {
         return this.commands;
     }
diff --git a/spark-common/src/main/java/me/lucko/spark/common/command/CommandResponseHandler.java b/spark-common/src/main/java/me/lucko/spark/common/command/CommandResponseHandler.java
index a9e2229..d1481bd 100644
--- a/spark-common/src/main/java/me/lucko/spark/common/command/CommandResponseHandler.java
+++ b/spark-common/src/main/java/me/lucko/spark/common/command/CommandResponseHandler.java
@@ -88,12 +88,20 @@ public class CommandResponseHandler {
     }
 
     public void broadcast(Component message) {
-        allSenders(sender -> sender.sendMessage(message));
+        if (this.platform.shouldBroadcastResponse()) {
+            allSenders(sender -> sender.sendMessage(message));
+        } else {
+            reply(message);
+        }
     }
 
     public void broadcast(Iterable<Component> message) {
-        Component joinedMsg = Component.join(JoinConfiguration.separator(Component.newline()), message);
-        allSenders(sender -> sender.sendMessage(joinedMsg));
+        if (this.platform.shouldBroadcastResponse()) {
+            Component joinedMsg = Component.join(JoinConfiguration.separator(Component.newline()), message);
+            allSenders(sender -> sender.sendMessage(joinedMsg));
+        } else {
+            reply(message);
+        }
     }
 
     public void replyPrefixed(Component message) {