From 8c22b3e4484aff0437fd68a067aa8d5e4cc1a4a0 Mon Sep 17 00:00:00 2001
From: high <pooop828@hotmail.com>
Date: Tue, 9 Aug 2011 18:15:47 -0400
Subject: [PATCH] Updated tshock for terraria 1.0.6. Removed hardcore kick for
 now as it needs to be fixed.

---
 TShockAPI/GetDataHandlers.cs         | 4 +++-
 TShockAPI/PacketBufferer.cs          | 4 ++--
 TShockAPI/Properties/AssemblyInfo.cs | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index 2b829071..c6be4ace 100755
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -599,7 +599,8 @@ namespace TShockAPI
 
             if (args.Player.InitSpawn && args.TPlayer.inventory[args.TPlayer.selectedItem].type != 50)
             {
-                if (args.TPlayer.hardCore && (TShock.Config.KickOnHardcoreDeath || TShock.Config.BanOnHardcoreDeath))
+                /*if (args.TPlayer.hardCore && (TShock.Config.KickOnHardcoreDeath || TShock.Config.BanOnHardcoreDeath))
+                {
                     if (args.TPlayer.selectedItem != 50)
                     {
                         if (TShock.Config.BanOnHardcoreDeath)
@@ -613,6 +614,7 @@ namespace TShockAPI
                         }
                         return true;
                     }
+                }*/
             }
             else
                 args.Player.InitSpawn = true;
diff --git a/TShockAPI/PacketBufferer.cs b/TShockAPI/PacketBufferer.cs
index e47ede9c..ac309bb5 100644
--- a/TShockAPI/PacketBufferer.cs
+++ b/TShockAPI/PacketBufferer.cs
@@ -40,7 +40,7 @@ namespace TShockAPI
             Commands.ChatCommands.Add(flush);
 #endif
 
-            ServerHooks.SendBytes += ServerHooks_SendBytes;
+            NetHooks.SendBytes += ServerHooks_SendBytes;
             ServerHooks.SocketReset += ServerHooks_SocketReset;
             GameHooks.PostUpdate += GameHooks_Update;
         }
@@ -51,7 +51,7 @@ namespace TShockAPI
             Commands.ChatCommands.Remove(dump);
             Commands.ChatCommands.Remove(flush);
 #endif
-            ServerHooks.SendBytes -= ServerHooks_SendBytes;
+            NetHooks.SendBytes -= ServerHooks_SendBytes;
             ServerHooks.SocketReset -= ServerHooks_SocketReset;
             GameHooks.PostUpdate -= GameHooks_Update;
         }
diff --git a/TShockAPI/Properties/AssemblyInfo.cs b/TShockAPI/Properties/AssemblyInfo.cs
index 58be0ff7..13d4333a 100644
--- a/TShockAPI/Properties/AssemblyInfo.cs
+++ b/TShockAPI/Properties/AssemblyInfo.cs
@@ -36,5 +36,5 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("1.0.*")]
 
 
-[assembly: AssemblyVersion("3.2.1.0805")]
-[assembly: AssemblyFileVersion("3.2.1.0805")]
+[assembly: AssemblyVersion("3.2.1.0809")]
+[assembly: AssemblyFileVersion("3.2.1.0809")]