From fcca88c2d6504c7dfb26ec11273cc2e01b28153d Mon Sep 17 00:00:00 2001
From: DogooFalchion <dogoo@nyxstudios.moe>
Date: Sun, 23 Oct 2016 14:01:36 -0400
Subject: [PATCH] Add support for start of line colors and terraria chat tags
 being nested.

---
 TShockAPI/Utils.cs | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/TShockAPI/Utils.cs b/TShockAPI/Utils.cs
index d6fc4a3b..c1869181 100644
--- a/TShockAPI/Utils.cs
+++ b/TShockAPI/Utils.cs
@@ -51,7 +51,10 @@ namespace TShockAPI
 		private static readonly Utils instance = new Utils();
 
 		/// <summary> This regex will look for the old MotD format for colors and replace them with the new chat format. </summary>
-		private Regex motdColorRegex = new Regex(@"\%\s*(?<r>\d{1,3})\s*,\s*(?<g>\d{1,3})\s*,\s*(?<b>\d{1,3})\s*\%(?<text>((?!\%\s*\d{1,3}\s*,\s*\d{1,3}\s*,\s*\d{1,3}\s*\%).)*)");
+		private Regex motdColorRegex = new Regex(@"\%\s*(?<r>\d{1,3})\s*,\s*(?<g>\d{1,3})\s*,\s*(?<b>\d{1,3})\s*\%(?<text>((?!(\%\s*\d{1,3}\s*,\s*\d{1,3}\s*,\s*\d{1,3}\s*\%)|(\[[a-zA-Z]/[^:]+:[^\]]*\])).)*)");
+
+		/// <summary> Matches the start of a line with our legacy color format</summary>
+		private Regex startOfLineColorRegex = new Regex(@"^\%\s*(?<r>\d{1,3})\s*,\s*(?<g>\d{1,3})\s*,\s*(?<b>\d{1,3})\s*\%");
 
 		/// <summary>Utils - Creates a utilities object.</summary>
 		private Utils() {}
@@ -702,8 +705,10 @@ namespace TShockAPI
 			bool containsOldFormat = false;
 			using (var tr = new StreamReader(file))
 			{
+				Color lineColor;
 				while ((foo = tr.ReadLine()) != null)
 				{
+					lineColor = Color.White;
 					if (string.IsNullOrWhiteSpace(foo))
 					{
 						continue;
@@ -712,6 +717,14 @@ namespace TShockAPI
 					foo = foo.Replace("%map%", (TShock.Config.UseServerName ? TShock.Config.ServerName : Main.worldName));
 					foo = foo.Replace("%players%", String.Join(",", GetPlayers(false)));
 
+					var legacyColorMatch = startOfLineColorRegex.Match(foo);
+					if (legacyColorMatch.Success)
+					{
+						lineColor = new Color(Int32.Parse(legacyColorMatch.Groups["r"].Value),
+												Int32.Parse(legacyColorMatch.Groups["g"].Value),
+												Int32.Parse(legacyColorMatch.Groups["b"].Value));
+						foo = foo.Replace(legacyColorMatch.Groups[0].Value, "");
+					}
 					string newFoo = ReplaceDeprecatedColorCodes(foo);
 					if (newFoo != foo && !containsOldFormat)
 					{
@@ -722,7 +735,7 @@ namespace TShockAPI
 					}
 					foo = newFoo;
 
-					player.SendMessage(foo, Color.White);
+					player.SendMessage(foo, lineColor);
 				}
 			}
 		}