Apply filter before color formatting for consistancy.

This commit is contained in:
Aust1n46 2020-03-21 14:44:49 -04:00
parent 09930bbad0
commit 6b275a1cba

View File

@ -23,17 +23,14 @@ public class Me extends MineverseCommand {
String msg = ""; String msg = "";
for(int x = 0; x < args.length; x++) for(int x = 0; x < args.length; x++)
if(args[x].length() > 0) if(args[x].length() > 0)
msg += " " + args[x]; msg += " " + args[x];
if(sender instanceof Player && MineverseChatAPI.getMineverseChatPlayer((Player) sender).hasFilter()) {
msg = Format.FilterChat(msg);
}
if(sender.hasPermission("venturechat.color")) if(sender.hasPermission("venturechat.color"))
msg = Format.FormatStringColor(msg); msg = Format.FormatStringColor(msg);
if(sender.hasPermission("venturechat.format")) if(sender.hasPermission("venturechat.format"))
msg = Format.FormatString(msg); msg = Format.FormatString(msg);
String filtered = Format.FilterChat(msg);
if(sender instanceof Player && MineverseChatAPI.getMineverseChatPlayer((Player) sender).hasFilter()) {
Player p = (Player) sender;
plugin.getServer().broadcastMessage("* " + p.getDisplayName() + filtered);
return;
}
if(sender instanceof Player) { if(sender instanceof Player) {
Player p = (Player) sender; Player p = (Player) sender;
plugin.getServer().broadcastMessage("* " + p.getDisplayName() + msg); plugin.getServer().broadcastMessage("* " + p.getDisplayName() + msg);