From d413b24b229e58b5ae4d420af6e05993177c8f05 Mon Sep 17 00:00:00 2001
From: Zack Piispanen <olink@shankshock.com>
Date: Sat, 10 May 2014 16:33:55 -0400
Subject: [PATCH] Fix Kick Message issue, fix health kicks for 600 health,
 update tsapi

---
 TShockAPI/GetDataHandlers.cs   | 2 +-
 TShockAPI/Net/DisconnectMsg.cs | 2 +-
 TShockAPI/TSPlayer.cs          | 2 +-
 TerrariaServerAPI              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index 2572c808..eda91184 100755
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -1332,7 +1332,7 @@ namespace TShockAPI
 			if (args.Player.FirstMaxHP == 0)
 				args.Player.FirstMaxHP = max;
 
-			if (cur < 0 || cur > 500 || max < 100 || max > 500) //Abnormal values have the potential to cause infinite loops in the server.
+			if (cur < 0 || cur > 600 || max < 100 || max > 600) //Abnormal values have the potential to cause infinite loops in the server.
 			{
 				TShock.Utils.ForceKick(args.Player, "Crash Exploit Attempt", true);
                 Log.ConsoleError("HP Exploit Attempt: Current HP {0}, Max HP {0}", cur, max);
diff --git a/TShockAPI/Net/DisconnectMsg.cs b/TShockAPI/Net/DisconnectMsg.cs
index eaaa6df8..568669eb 100644
--- a/TShockAPI/Net/DisconnectMsg.cs
+++ b/TShockAPI/Net/DisconnectMsg.cs
@@ -33,7 +33,7 @@ namespace TShockAPI.Net
 
 		public override void Pack(Stream stream)
 		{
-			stream.WriteBytes(Encoding.UTF8.GetBytes(Reason));
+			stream.WriteString(Reason);
 		}
 	}
 }
\ No newline at end of file
diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs
index cb0a8c20..7f6bc8d6 100755
--- a/TShockAPI/TSPlayer.cs
+++ b/TShockAPI/TSPlayer.cs
@@ -611,7 +611,7 @@ namespace TShockAPI
 			return true;
 		}
 
-		public void Heal(int health = 500)
+		public void Heal(int health = 600)
 		{
 			NetMessage.SendData((int)PacketTypes.PlayerHealOther, -1, -1, "", this.TPlayer.whoAmi, health);
 		}
diff --git a/TerrariaServerAPI b/TerrariaServerAPI
index 6a869878..41473d9c 160000
--- a/TerrariaServerAPI
+++ b/TerrariaServerAPI
@@ -1 +1 @@
-Subproject commit 6a869878bdfcd6ab3fb81c5162e98bec94ee3e26
+Subproject commit 41473d9c8bfadbd14fca2e917c8299903827eae5