diff options
| author | feildmaster <admin@feildmaster.com> | 2012-12-18 04:47:56 -0600 |
|---|---|---|
| committer | feildmaster <admin@feildmaster.com> | 2012-12-18 04:47:56 -0600 |
| commit | 23854afbfef030eec243a91f4afbe1d42e5ab204 (patch) | |
| tree | 646f036d5cca7e2d75983bab70364bf3d19bacd0 /src/main/java/org | |
| parent | 14ec80289abfca502c77a220da7699b9efb2d875 (diff) | |
| download | bukkit-23854afbfef030eec243a91f4afbe1d42e5ab204.tar bukkit-23854afbfef030eec243a91f4afbe1d42e5ab204.tar.gz bukkit-23854afbfef030eec243a91f4afbe1d42e5ab204.tar.lz bukkit-23854afbfef030eec243a91f4afbe1d42e5ab204.tar.xz bukkit-23854afbfef030eec243a91f4afbe1d42e5ab204.zip | |
Apply commandBlockOutput to broadcastMessage. Addresses BUKKIT-3117
Diffstat (limited to 'src/main/java/org')
| -rw-r--r-- | src/main/java/org/bukkit/command/Command.java | 8 |
1 files changed, 7 insertions, 1 deletions
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<Permissible> 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<Permissible> users = Bukkit.getPluginManager().getPermissionSubscriptions(Server.BROADCAST_CHANNEL_ADMINISTRATIVE); String colored = ChatColor.GRAY + "" + ChatColor.ITALIC + "[" + result + "]"; if (sendToSource && !(source instanceof ConsoleCommandSender)) { |