From 95b2259eb4d7362b137d26037f8312b3d80f0244 Mon Sep 17 00:00:00 2001
From: Leonardo Bishop <me@leonardobishop.com>
Date: Sat, 29 Jul 2023 02:55:08 +0100
Subject: Add fall damage

---
 code/phase/WaitPhase.cs | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'code/phase/WaitPhase.cs')

diff --git a/code/phase/WaitPhase.cs b/code/phase/WaitPhase.cs
index 9eab094..6014467 100644
--- a/code/phase/WaitPhase.cs
+++ b/code/phase/WaitPhase.cs
@@ -52,21 +52,26 @@ public class WaitPhase : BasePhase
 					pawn.Transform = tx;
 				}
 
-				pawn.CurrentTeam = Team.Bystander;
 				pawn.Spawn();
-				pawn.Respawn();
+				RespawnPlayer( pawn );
 			} else
 			{
 				var pawn = (Player)client.Pawn;
-				if (pawn.LifeState == LifeState.Dead)
+				if (pawn.LifeState == LifeState.Dead && pawn.TimeSinceDeath > 3)
 				{
-					pawn.CurrentTeam = Team.Bystander;
-					pawn.Respawn();
+					RespawnPlayer( pawn );
 				}
 			}
 		}
 	}
 
+	private void RespawnPlayer(Player pawn)
+	{
+		pawn.CurrentTeam = Team.Spectator;
+		pawn.DressFromClient( pawn.Client );
+		pawn.Respawn();
+	}
+
 	public override void HandleClientJoin( ClientJoinedEvent e )
 	{
 		
-- 
cgit v1.2.3-70-g09d2