diff --git a/TShockAPI/ConfigFile.cs b/TShockAPI/ConfigFile.cs
index 1fc229a1..f16d9af1 100644
--- a/TShockAPI/ConfigFile.cs
+++ b/TShockAPI/ConfigFile.cs
@@ -267,10 +267,6 @@ namespace TShockAPI
         [Description("A dictionary of REST tokens that external applications may use to make queries to your server.")]
             public Dictionary<string, SecureRest.TokenData> ApplicationRestTokens = new Dictionary<string, SecureRest.TokenData>();
 
-	    [Description("The maximum value that a character may have for health.")] public int MaxHealth = 500;
-
-	    [Description("The maximum value that a character may have for health.")] public int MaxMana = 500;
-
 		[Description("The number of reserved slots past your max server slot that can be joined by reserved players")] public int ReservedSlots = 20;
 		
 		[Description("The number of reserved slots past your max server slot that can be joined by reserved players")] public bool LogRest = false;
diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index 39bb93c4..edf8188f 100755
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -1315,9 +1315,9 @@ namespace TShockAPI
 			if (args.Player.FirstMaxHP == 0)
 				args.Player.FirstMaxHP = max;
 
-			if ((max > TShock.Config.MaxHealth && max > args.Player.FirstMaxHP) && !args.Player.Group.HasPermission(Permissions.ignorestathackdetection))
+			if (cur < 0 || cur > 500 || max < 100 || max > 500) //Abnormal values have the potential to cause infinite loops in the server.
 			{
-				TShock.Utils.ForceKick(args.Player, "Hacked Client Detected.", true);
+				TShock.Utils.ForceKick(args.Player, "Crash Exploit Attempt", true);
 				return false;
 			}
 
@@ -1333,9 +1333,6 @@ namespace TShockAPI
 				args.Player.Heal(args.TPlayer.statLifeMax);
 			}
 
-			if (cur <= 0)
-				TSPlayer.All.SendData(PacketTypes.PlayerKillMe, "attempt at aboose", args.TPlayer.whoAmi);
-
 			return false;
 		}
 
@@ -1351,9 +1348,9 @@ namespace TShockAPI
 			if (args.Player.FirstMaxMP == 0)
 				args.Player.FirstMaxMP = max;
 
-            if (max > TShock.Config.MaxMana && max > args.Player.FirstMaxMP)
+			if (cur < 0 || cur > 400 || max < 20 || max > 200) //Abnormal values have the potential to cause infinite loops in the server.
 			{
-				TShock.Utils.ForceKick(args.Player, "Hacked Client Detected.", true);
+				TShock.Utils.ForceKick(args.Player, "Crash Exploit Attempt", true);
 				return false;
 			}
 
@@ -1567,11 +1564,6 @@ namespace TShockAPI
 				TShock.Utils.ForceKick(args.Player, "Blank name.", true);
 				return true;
 			}
-			if (TShock.HackedStats(args.Player) && !args.Player.Group.HasPermission(Permissions.ignorestathackdetection))
-			{
-				TShock.Utils.ForceKick(args.Player, "You have hacked health/mana, please use a different character.", true);
-				return true;
-			}
 
 			if (!args.Player.Group.HasPermission(Permissions.ignorestackhackdetection))
 			{
@@ -2495,6 +2487,13 @@ namespace TShockAPI
 			var direction = args.Data.ReadInt8();
 			var dmg = args.Data.ReadInt16();
 			var pvp = args.Data.ReadInt8() == 0;
+
+			if (dmg > 20000) //Abnormal values have the potential to cause infinite loops in the server.
+			{
+				TShock.Utils.ForceKick(args.Player, "Crash Exploit Attempt", true);
+				return false;
+			}
+
 			if (OnKillMe(id, direction, dmg, pvp))
 				return true;
 			int textlength = (int) (args.Data.Length - args.Data.Position - 1);
@@ -2944,6 +2943,12 @@ namespace TShockAPI
 			var pvp = args.Data.ReadBoolean();
 			var crit = args.Data.ReadBoolean();
 
+			if (dmg > 10000) //Abnormal values have the potential to cause infinite loops in the server.
+			{
+				TShock.Utils.ForceKick(args.Player, "Crash Exploit Attempt", true);
+				return false;
+			}
+
 			if (OnPlayerDamage(id, direction, dmg, pvp, crit))
 				return true;
 
diff --git a/TShockAPI/Permissions.cs b/TShockAPI/Permissions.cs
index df05ccfe..87d5397d 100644
--- a/TShockAPI/Permissions.cs
+++ b/TShockAPI/Permissions.cs
@@ -139,9 +139,6 @@ namespace TShockAPI
 		[Description("Prevents you from being disabled by stack hack detection.")]
 		public static readonly string ignorestackhackdetection = "tshock.ignore.itemstack";
 
-		[Description("Prevents you from being kicked by hacked health detection.")]
-		public static readonly string ignorestathackdetection = "tshock.ignore.stats";
-
 		[Description("Prevents your actions from being ignored if damage is too high.")]
 		public static readonly string ignoredamagecap = "tshock.ignore.damage";
 
diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index 1051cac2..e98168cb 100755
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -1572,14 +1572,6 @@ namespace TShockAPI
 			return (float) Math.Sqrt(num3);
 		}
 
-		public static bool HackedStats(TSPlayer player)
-		{
-            return (player.TPlayer.statManaMax > TShock.Config.MaxMana) ||
-                   (player.TPlayer.statMana > TShock.Config.MaxMana) ||
-                   (player.TPlayer.statLifeMax > TShock.Config.MaxHealth) ||
-                   (player.TPlayer.statLife > TShock.Config.MaxHealth);
-		}
-
 		public static bool HackedInventory(TSPlayer player)
 		{
 			bool check = false;
diff --git a/TShockAPI/Utils.cs b/TShockAPI/Utils.cs
index 4861b982..fa5967ec 100644
--- a/TShockAPI/Utils.cs
+++ b/TShockAPI/Utils.cs
@@ -576,7 +576,10 @@ namespace TShockAPI
 			if (TShock.Config.ServerSideCharacter)
 				foreach (TSPlayer player in TShock.Players)
 					if (player != null && player.IsLoggedIn && !player.IgnoreActionsForClearingTrashCan)
+					{
+						player.PlayerData.CopyCharacter(player);
 						TShock.CharacterDB.InsertPlayerData(player);
+					}
 
 			StopServer(true, reason);
 			System.Diagnostics.Process.Start(System.Reflection.Assembly.GetExecutingAssembly().GetName().CodeBase);