From 636ddb2aba86b14288ef6b675550def606a01f10 Mon Sep 17 00:00:00 2001
From: darkunderdog <darkunderdog@gmail.com>
Date: Thu, 22 Dec 2011 20:44:49 -0600
Subject: [PATCH] updated chatformat to include groupname

---
 TShockAPI/ConfigFile.cs | 4 ++--
 TShockAPI/TShock.cs     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/TShockAPI/ConfigFile.cs b/TShockAPI/ConfigFile.cs
index 35dd0ca6..e6ec0d8b 100644
--- a/TShockAPI/ConfigFile.cs
+++ b/TShockAPI/ConfigFile.cs
@@ -183,8 +183,8 @@ namespace TShockAPI
         [Description("Disables snow ball projectiles from spawning")] //Change this to stop the tile from spawning
         public bool DisableSnowBalls = false;
 
-        [Description("Change ingame chat format, {0} = Group Prefix, {1} = Player Name, {2} = Group Suffix, {3} = Chat Message")]
-        public string ChatFormat = "{0}{1}{2} {3}";
+        [Description("Change ingame chat format, {0} = Group Name, {1} = Group Prefix, {2} = Player Name, {3} = Group Suffix, {4} = Chat Message")]
+        public string ChatFormat = "{1}{2}{3} {4}";
         
 		public static ConfigFile Read(string path)
         {
diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index 67613d7b..c8fecc6f 100644
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -560,7 +560,7 @@ namespace TShockAPI
             }
             else
             {
-                TShock.Utils.Broadcast(String.Format(TShock.Config.ChatFormat, tsplr.Group.Prefix, tsplr.Name, tsplr.Group.Suffix, text), tsplr.Group.R, tsplr.Group.G, tsplr.Group.B);
+                TShock.Utils.Broadcast(String.Format(TShock.Config.ChatFormat, tsplr.Group.Name, tsplr.Group.Prefix, tsplr.Name, tsplr.Group.Suffix, text), tsplr.Group.R, tsplr.Group.G, tsplr.Group.B);
                 e.Handled = true;
             }
         }