From d1f24b423f5a021bb2677770fac878f005dc49dd Mon Sep 17 00:00:00 2001
From: Marco Cawthorne <marco@vera-visions.com>
Date: Fri, 26 Aug 2022 15:51:08 -0700
Subject: [PATCH] GameRules: Fix player death

---
 src/server/gamerules.qc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/server/gamerules.qc b/src/server/gamerules.qc
index 4200f76..21433f6 100644
--- a/src/server/gamerules.qc
+++ b/src/server/gamerules.qc
@@ -71,11 +71,10 @@ HLGameRules::PlayerDeath(NSClientPlayer pl)
 			g_dmg_eAttacker.frags++;
 	}
 
-	pl.movetype = MOVETYPE_NONE;
-	pl.solid = SOLID_NOT;
+	pl.Death();
 	pl.takedamage = DAMAGE_NO;
 	pl.gflags &= ~GF_FLASHLIGHT;
-	pl.armor = pl.activeweapon = pl.g_items = 0;
+	pl.gflags &= ~GF_EGONBEAM;
 
 	pl.think = PutClientInServer;
 	pl.nextthink = time + 4.0f;