From 724db6eab4db17f3fe68813443c09d36399cf603 Mon Sep 17 00:00:00 2001
From: cerevisiae <cerevisiae@kinkood.com>
Date: Mon, 29 Nov 2010 23:02:23 -0600
Subject: [PATCH] Added prefix coloring. To get it to work the first character
 has to be the color you want your name to be followed by your prefix colored
 as you would any other quake colored line of text.

---
 vminecraftChat.java     | 13 +++++--------
 vminecraftCommands.java |  4 ++--
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/vminecraftChat.java b/vminecraftChat.java
index dddbbd7e9..83ed3cebb 100644
--- a/vminecraftChat.java
+++ b/vminecraftChat.java
@@ -128,7 +128,9 @@ public class vminecraftChat {
 	//Use:		Returns the colored name;
 	//=====================================================================
     public static String nameColor(Player player){
-        return player.getColor() + player.getName();
+    	String[] playerPrefix = new String[]{player.getPrefix()};
+        return applyColors(playerPrefix)[0].substring(3)
+        		+ player.getColor().substring(0,2) + player.getName();
     }
     
 	//=====================================================================
@@ -243,12 +245,7 @@ public class vminecraftChat {
 					if (p.isAdmin() || (p.canUseCommand("/adminchat"))) {
 
 						//Output the first line
-						p.sendMessage(adminchat + msg[0]);
-						
-						//Get the rest of the lines and display them.
-						String[] tempOut = new String[msg.length - 1];
-						System.arraycopy(msg, 1, tempOut, 0, tempOut.length);
-						for(String str: tempOut)
+						for(String str: msg)
 							p.sendMessage(str);
 					}
 				}
@@ -327,7 +324,7 @@ public class vminecraftChat {
 		//Format the name
 		String playerName = Colors.White + "<"
 		+ nameColor(player) + Colors.White +"> ";
-		if(vminecraftSettings.getInstance().quakeColors() && message.length()>2) {
+		if(vminecraftSettings.getInstance().quakeColors()) {
 
 			//Log the chat
 			log.log(Level.INFO, "<"+player.getName()+"> "+message);
diff --git a/vminecraftCommands.java b/vminecraftCommands.java
index aa37744a9..8c9d2db29 100644
--- a/vminecraftCommands.java
+++ b/vminecraftCommands.java
@@ -224,8 +224,8 @@ public class vminecraftCommands{
 			for(String msg: message)
 			{
 				if (msg.contains(playerName))
-					vminecraftChat.gmsg(
-							vminecraftChat.rainbow(
+					vminecraftChat.gmsg( playerName
+							+ vminecraftChat.rainbow(
 									msg.substring(playerName.length() - 1)));
 				else
 					vminecraftChat.gmsg(msg);