diff --git a/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java b/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java index 3e8c71e3..e7f7d240 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java @@ -7,10 +7,7 @@ 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; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -109,10 +106,28 @@ public class ChatManager extends FreedomService event.setFormat(format); } + public ChatColor getColor(Admin admin, Displayable display) + { + ChatColor color = display.getColor(); + if (admin.getOldTags()) + { + + if (color.equals(ChatColor.AQUA)) + { + color = ChatColor.GOLD; + } + else if (color.equals(ChatColor.GOLD)) + { + color = ChatColor.LIGHT_PURPLE; + } + } + return color; + } + public String getColoredTag(Admin admin, Displayable display) { ChatColor color = display.getColor(); - if(admin.getOldTags()) + if (admin.getOldTags()) { if (color.equals(ChatColor.AQUA)) @@ -140,7 +155,8 @@ public class ChatManager extends FreedomService if (!Strings.isNullOrEmpty(admin.getAcFormat())) { String format = admin.getAcFormat(); - String msg = format.replace("%name%", sender.getName()).replace("%rank%", display.getAbbr()).replace("%rankcolor%", display.getColor().toString()).replace("%msg%", message); + ChatColor color = getColor(admin, display); + String msg = format.replace("%name%", sender.getName()).replace("%rank%", display.getAbbr()).replace("%rankcolor%", color.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 7860fe68..bbedc2d2 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java @@ -203,7 +203,7 @@ public class Command_myadmin extends FreedomCommand target.setOldTags(!target.getOldTags()); plugin.al.save(); plugin.al.updateTables(); - msg(target.getOldTags() ? "Enabled" : "Disabled" + " old tags."); + msg((target.getOldTags() ? "Enabled" : "Disabled") + " old tags."); return true; }