From 2ce26f9c09224f94118c6a070e6a453b94e9b6f1 Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Fri, 19 Oct 2012 16:37:22 +0800
Subject: [PATCH] Duplicate some code in Messaging.tr temporarily

---
 .../java/net/citizensnpcs/util/Messaging.java   | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/citizensnpcs/util/Messaging.java b/src/main/java/net/citizensnpcs/util/Messaging.java
index 5bfe62af9..07d6a0677 100644
--- a/src/main/java/net/citizensnpcs/util/Messaging.java
+++ b/src/main/java/net/citizensnpcs/util/Messaging.java
@@ -98,7 +98,22 @@ public class Messaging {
     }
 
     public static String tr(String key, Object... messages) {
-        return Translator.translate(key, messages);
+        String message = Translator.translate(key, messages);
+        String trimmed = message.trim();
+        String messageColour = StringHelper.parseColors(Setting.MESSAGE_COLOUR.asString());
+        if (!trimmed.isEmpty()) {
+            if (trimmed.charAt(0) == ChatColor.COLOR_CHAR) {
+                ChatColor test = ChatColor.getByChar(trimmed.substring(1, 2));
+                if (test == null) {
+                    message = messageColour + message;
+                } else
+                    messageColour = test.toString();
+            } else
+                message = messageColour + message;
+        }
+        message = message.replace("[[", StringHelper.parseColors(Setting.HIGHLIGHT_COLOUR.asString()));
+        message = message.replace("]]", messageColour);
+        return message;
     }
 
     public static String tryTranslate(Object possible) {