diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index acf4faeb..f2adac02 100644
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -213,7 +213,7 @@ namespace TShockAPI
                 Tools.ForceKick(args.Player, "Server is set to hardcore characters only!");
                 return true;
             }
-
+            args.Player.Difficulty = difficulty;
             args.Player.ReceivedInfo = true;
             return false;
         }
@@ -511,7 +511,8 @@ namespace TShockAPI
                 return Tools.HandleGriefer(args.Player, TShock.Config.KillMeAbuseReason);
             }
             args.Player.LastDeath = DateTime.Now;
-            args.Player.ForceSpawn = true;
+            if (args.Player.Difficulty != 2)
+                args.Player.ForceSpawn = true;
             return false;
         }
 
diff --git a/TShockAPI/Properties/AssemblyInfo.cs b/TShockAPI/Properties/AssemblyInfo.cs
index c5772f58..29d67f40 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.8.0902")]
-[assembly: AssemblyFileVersion("3.2.8.0902")]
+[assembly: AssemblyVersion("3.2.8.0903")]
+[assembly: AssemblyFileVersion("3.2.8.0903")]
diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs
index ac1e71cb..251f5650 100644
--- a/TShockAPI/TSPlayer.cs
+++ b/TShockAPI/TSPlayer.cs
@@ -61,6 +61,7 @@ namespace TShockAPI
         public DateTime LastDeath { get; set; }
         public bool ForceSpawn = false;
         public string Country = "??";
+        public int Difficulty;
 
         public bool RealPlayer
         {