diff --git a/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java b/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java index 934ef049..3e8c71e3 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java @@ -7,6 +7,8 @@ import me.totalfreedom.totalfreedommod.rank.Displayable; import me.totalfreedom.totalfreedommod.util.FLog; import me.totalfreedom.totalfreedommod.util.FSync; import static me.totalfreedom.totalfreedommod.util.FUtil.playerMsg; + +import me.totalfreedom.totalfreedommod.util.FUtil; import org.bukkit.Sound; import org.bukkit.SoundCategory; import org.bukkit.ChatColor; @@ -137,10 +139,9 @@ public class ChatManager extends FreedomService Admin admin = plugin.al.getAdmin(player); if (!Strings.isNullOrEmpty(admin.getAcFormat())) { - String coloredTag = getColoredTag(admin, display); String format = admin.getAcFormat(); - String msg = format.replace("%name%", sender.getName()).replace("%tag%", coloredTag).replace("%message%", message); - player.sendMessage(msg); + String msg = format.replace("%name%", sender.getName()).replace("%rank%", display.getAbbr()).replace("%rankcolor%", display.getColor().toString()).replace("%msg%", message); + player.sendMessage(FUtil.colorize(msg)); } else { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java index d62e68a8..7860fe68 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java @@ -186,7 +186,7 @@ public class Command_myadmin extends FreedomCommand plugin.al.save(); plugin.al.updateTables(); msg("Set admin chat format to \"" + format + "\".", ChatColor.GRAY); - String example = format.replace("%name%", "ExampleAdmin").replace("%rank%", "STA").replace("%msg%", "The quick brown fox jumps over the lazy dog."); + String example = format.replace("%name%", "ExampleAdmin").replace("%rank%", Rank.TELNET_ADMIN.getAbbr()).replace("%rankcolor%", Rank.TELNET_ADMIN.getColor().toString()).replace("%msg%", "The quick brown fox jumps over the lazy dog."); msg(ChatColor.GRAY + "Example: " + FUtil.colorize(example)); return true; }