diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index 6ed0f8de..a21fe55f 100644
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -2734,8 +2734,11 @@ namespace TShockAPI
 
 			if (OnPlayerSpawn(args.Player, args.Data, player, spawnX, spawnY, respawnTimer, numberOfDeathsPVE, numberOfDeathsPVP, context))
 				return true;
-			
-			args.Player.Dead = respawnTimer > 0;
+
+			if (!Main.ServerSideCharacter || context != PlayerSpawnContext.SpawningIntoWorld)
+			{
+				args.Player.Dead = respawnTimer > 0;
+			}
 
 			if (Main.ServerSideCharacter)
 			{