From 40e1f11b61fba532f1eef930c208ede0987b797a Mon Sep 17 00:00:00 2001
From: Shank <nicatron21@gmail.com>
Date: Mon, 30 May 2011 20:41:08 -0600
Subject: [PATCH] Updated messageBuffer to parse out newline names.

---
 TShockAPI/TShockAPI.csproj | 4 ++++
 Terraria/ShankShock.cs     | 5 ++---
 Terraria/messageBuffer.cs  | 7 ++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/TShockAPI/TShockAPI.csproj b/TShockAPI/TShockAPI.csproj
index 5b24c5bf..639cb641 100644
--- a/TShockAPI/TShockAPI.csproj
+++ b/TShockAPI/TShockAPI.csproj
@@ -53,6 +53,10 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/Terraria/ShankShock.cs b/Terraria/ShankShock.cs
index d970379b..463a5e4b 100644
--- a/Terraria/ShankShock.cs
+++ b/Terraria/ShankShock.cs
@@ -9,7 +9,7 @@ namespace Terraria
 {
 	class ShankShock
 	{
-        private static double version = 3;
+        private static double version = 4;
         private static bool shownVersion = false;
 
         public static bool killGuide = true;
@@ -308,8 +308,7 @@ namespace Terraria
         {
             
             if (banTnt) { _writeGrief(ply); }
-            ShankShock.Broadcast(FindPlayer(ply) + " was " + (banTnt ? "banned " : "kicked ") + "for kill tile abuse.");
-            if (kickTnt) { Kick(ply); }
+            if (kickTnt) { ShankShock.Broadcast(FindPlayer(ply) + " was " + (banTnt ? "banned " : "kicked ") + "for kill tile abuse."); Kick(ply); }
         }
 
         private static void _writeGrief(int ply)
diff --git a/Terraria/messageBuffer.cs b/Terraria/messageBuffer.cs
index 5602b5b4..222071fb 100644
--- a/Terraria/messageBuffer.cs
+++ b/Terraria/messageBuffer.cs
@@ -610,6 +610,11 @@
                     Main.player[num7].shoeColor.B = this.readBuffer[index];
                     index++;
                     string text = Encoding.ASCII.GetString(this.readBuffer, index, (length - index) + start);
+                    text = text.Replace("\\", "");
+                    if (text == "" || text == " ")
+                    {
+                        text = "mingebag";
+                    }
                     Main.player[num7].name = text;
                     if (Main.netMode == 2)
                     {
@@ -1082,7 +1087,7 @@
                                             ShankShock.SendMessage(this.whoAmI, "/p - Talk in party chat");
                                             if (ShankShock.IsAdmin(this.whoAmI))
                                             {
-                                                ShankShock.SendMessage(this.whoAmI, "/kick | /ban | /eater | /hardcore");
+                                                ShankShock.SendMessage(this.whoAmI, "/kick | /ban | /eater | /hardcore | /skeletron");
                                                 ShankShock.SendMessage(this.whoAmI, "/invade | /dropmeteor | /bloodmoon | /eye");
                                             }
                                             return;