diff --git a/src/mineverse/Aust1n46/chat/command/chat/Broadcast.java b/src/mineverse/Aust1n46/chat/command/chat/Broadcast.java index 5574860..33da48f 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Broadcast.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Broadcast.java @@ -20,7 +20,7 @@ public class Broadcast extends MineverseCommand { public void execute(CommandSender sender, String command, String[] args) { ConfigurationSection bs = plugin.getConfig().getConfigurationSection("broadcast"); String broadcastColor = bs.getString("color", "white"); - String broadcastPermissions = bs.getString("permissions", ""); + String broadcastPermissions = bs.getString("permissions", "None"); String broadcastDisplayTag = Format.FormatStringAll(bs.getString("displaytag", "[Broadcast]")); if(broadcastPermissions.equalsIgnoreCase("None") || sender.hasPermission(broadcastPermissions)) { if(args.length > 0) { @@ -29,7 +29,7 @@ public class Broadcast extends MineverseCommand { if(args[x].length() > 0) bc += args[x] + " "; } bc = Format.FormatStringAll(bc); - plugin.getServer().broadcastMessage(broadcastDisplayTag + ChatColor.valueOf(broadcastColor.toUpperCase()) + " " + bc); + Format.broadcastToServer(broadcastDisplayTag + ChatColor.valueOf(broadcastColor.toUpperCase()) + " " + bc); return; } else { diff --git a/src/mineverse/Aust1n46/chat/listeners/CommandListener.java b/src/mineverse/Aust1n46/chat/listeners/CommandListener.java index 7b05909..710494e 100644 --- a/src/mineverse/Aust1n46/chat/listeners/CommandListener.java +++ b/src/mineverse/Aust1n46/chat/listeners/CommandListener.java @@ -125,7 +125,7 @@ public class CommandListener implements CommandExecutor, Listener { event.setCancelled(true); } if(s.startsWith("Broadcast:")) { - plugin.getServer().broadcastMessage(s.substring(11).replace("$", send)); + Format.broadcastToServer(s.substring(11).replace("$", send)); event.setCancelled(true); } } diff --git a/src/mineverse/Aust1n46/chat/utilities/Format.java b/src/mineverse/Aust1n46/chat/utilities/Format.java index 554bff0..82e0784 100644 --- a/src/mineverse/Aust1n46/chat/utilities/Format.java +++ b/src/mineverse/Aust1n46/chat/utilities/Format.java @@ -19,6 +19,7 @@ import com.comphenix.protocol.wrappers.WrappedChatComponent; import me.clip.placeholderapi.PlaceholderAPI; import mineverse.Aust1n46.chat.MineverseChat; +import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.json.JsonFormat; import mineverse.Aust1n46.chat.localization.LocalizedMessage; @@ -836,4 +837,10 @@ public class Format { } return false; } + + public static void broadcastToServer(String message) { + for(MineverseChatPlayer mcp : MineverseChatAPI.getOnlineMineverseChatPlayers()) { + mcp.getPlayer().sendMessage(message); + } + } }