5 files changed, 15 insertions, 27 deletions

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 5bc4a5f39..d69dd14cd 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -1,4 +1,3 @@
-
 -- APIDesc.lua
 
 -- Contains the API objects' descriptions
@@ -308,18 +307,15 @@ g_APIDesc =
 				A wrapper class for constants representing colors or effects.
 			]],
 
-			Functions =
-			{
-				MakeColor = { Params = "ColorCodeConstant", Return = "string", Notes = "Creates the complete color-code-sequence from the color or effect constant" },
-			},
+			Functions = {},
 			Constants =
 			{
 				Black         = { Notes = "" },
 				Blue          = { Notes = "" },
 				Bold          = { Notes = "" },
-				Color         = { Notes = "The first character of the color-code-sequence, §" },
+				Color         = { Notes = "The first character of the color-code-sequence, �" },
 				DarkPurple    = { Notes = "" },
-				Delimiter     = { Notes = "The first character of the color-code-sequence, §" },
+				Delimiter     = { Notes = "The first character of the color-code-sequence, �" },
 				Gold          = { Notes = "" },
 				Gray          = { Notes = "" },
 				Green         = { Notes = "" },
diff --git a/src/ChatColor.cpp b/src/ChatColor.cpp
index 2b223ee76..72a0a6928 100644
--- a/src/ChatColor.cpp
+++ b/src/ChatColor.cpp
@@ -1,4 +1,3 @@
-
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "ChatColor.h"
@@ -29,11 +28,5 @@ const std::string cChatColor::Underlined  = cChatColor::Color + "n";
 const std::string cChatColor::Italic      = cChatColor::Color + "o";
 const std::string cChatColor::Plain       = cChatColor::Color + "r";
 
-const std::string cChatColor::MakeColor( char a_Color )
-{
-	return cChatColor::Color + a_Color;
-}
-
-
 
 
diff --git a/src/ChatColor.h b/src/ChatColor.h
index 85b10f400..643c4d5d8 100644
--- a/src/ChatColor.h
+++ b/src/ChatColor.h
@@ -29,15 +29,14 @@ public:
 	static const std::string Yellow;
  	static const std::string White;
 
-  // Styles ( source: http://wiki.vg/Chat )
-  static const std::string Random;
-  static const std::string Bold;
-  static const std::string Strikethrough;
-  static const std::string Underlined;
-  static const std::string Italic;
-  static const std::string Plain;
-
-	static const std::string MakeColor( char a_Color );
+	// Styles ( source: http://wiki.vg/Chat )
+	static const std::string Random;
+	static const std::string Bold;
+	static const std::string Strikethrough;
+	static const std::string Underlined;
+	static const std::string Italic;
+	static const std::string Plain;
+
 };
 
 // tolua_end
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 948a259ff..b923a094e 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -1294,7 +1294,7 @@ AString cPlayer::GetColor(void) const
 {
 	if ( m_Color != '-' )
 	{
-		return cChatColor::MakeColor( m_Color );
+		return cChatColor::Color + m_Color;
 	}
 
 	if ( m_Groups.size() < 1 )
diff --git a/src/GroupManager.cpp b/src/GroupManager.cpp
index 1ffe3812f..792acc2c3 100644
--- a/src/GroupManager.cpp
+++ b/src/GroupManager.cpp
@@ -79,11 +79,11 @@ cGroupManager::cGroupManager()
 		Group->SetName( KeyName );
 		char Color = IniFile.GetValue( KeyName, "Color", "-" )[0];
 		if( Color != '-' )
-			Group->SetColor( cChatColor::MakeColor(Color) );
+			Group->SetColor( cChatColor::Color + Color );
 		else
 			Group->SetColor( cChatColor::White );
 
-		std::string Commands = IniFile.GetValue( KeyName, "Commands", "" );
+		AString Commands = IniFile.GetValue( KeyName, "Commands", "" );
 		if( Commands.size() > 0 )
 		{
 			AStringVector Split = StringSplit( Commands, "," );
@@ -93,7 +93,7 @@ cGroupManager::cGroupManager()
 			}
 		}
 
-		std::string Permissions = IniFile.GetValue( KeyName, "Permissions", "" );
+		AString Permissions = IniFile.GetValue( KeyName, "Permissions", "" );
 		if( Permissions.size() > 0 )
 		{
 			AStringVector Split = StringSplit( Permissions, "," );