From 83eb707761dc37ebb0b7a90aadeca5896fb568f0 Mon Sep 17 00:00:00 2001
From: Chris <2648373+QuiCM@users.noreply.github.com>
Date: Fri, 22 May 2020 13:27:03 +0930
Subject: [PATCH] Update SendMessage and SendMessageFromPlayer to use inbuilt
 Terraria chat messaging

---
 TShockAPI/TSPlayer.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs
index 49373448..8ef56027 100644
--- a/TShockAPI/TSPlayer.cs
+++ b/TShockAPI/TSPlayer.cs
@@ -1421,7 +1421,15 @@ namespace TShockAPI
 				}
 				return;
 			}
-			SendData(PacketTypes.SmartTextMessage, msg, 255, red, green, blue, -1);
+
+			if (this.Index == -1) //-1 is our broadcast index - this implies we're using TSPlayer.All.SendMessage and broadcasting to all clients
+			{
+				Terraria.Chat.ChatHelper.BroadcastChatMessage(NetworkText.FromFormattable(msg), new Color(red, green, blue));
+			}
+			else
+			{
+				Terraria.Chat.ChatHelper.SendChatMessageToClient(NetworkText.FromFormattable(msg), new Color(red, green, blue), this.Index);
+			}
 		}
 
 		/// <summary>
@@ -1443,7 +1451,7 @@ namespace TShockAPI
 				}
 				return;
 			}
-			SendDataFromPlayer(PacketTypes.SmartTextMessage, ply, msg, red, green, blue, -1);
+			Terraria.Chat.ChatHelper.BroadcastChatMessageAs((byte)ply, NetworkText.FromFormattable(msg), new Color(red, green, blue));
 		}
 
 		/// <summary>