From 23854afbfef030eec243a91f4afbe1d42e5ab204 Mon Sep 17 00:00:00 2001 From: feildmaster Date: Tue, 18 Dec 2012 04:47:56 -0600 Subject: Apply commandBlockOutput to broadcastMessage. Addresses BUKKIT-3117 --- src/main/java/org/bukkit/command/Command.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java index 16957425..f43d7be3 100644 --- a/src/main/java/org/bukkit/command/Command.java +++ b/src/main/java/org/bukkit/command/Command.java @@ -330,8 +330,14 @@ public abstract class Command { } public static void broadcastCommandMessage(CommandSender source, String message, boolean sendToSource) { - Set users = Bukkit.getPluginManager().getPermissionSubscriptions(Server.BROADCAST_CHANNEL_ADMINISTRATIVE); String result = source.getName() + ": " + message; + + if (source instanceof BlockCommandSender && ((BlockCommandSender) source).getBlock().getWorld().getGameRuleValue("commandBlockOutput").equalsIgnoreCase("false")) { + Bukkit.getConsoleSender().sendMessage(result); + return; + } + + Set users = Bukkit.getPluginManager().getPermissionSubscriptions(Server.BROADCAST_CHANNEL_ADMINISTRATIVE); String colored = ChatColor.GRAY + "" + ChatColor.ITALIC + "[" + result + "]"; if (sendToSource && !(source instanceof ConsoleCommandSender)) { -- cgit v1.2.3