From 0bb9018103768a084c314d848178899af1c9ef0a Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 10 Sep 2013 16:04:26 +1000 Subject: [PATCH] Eject the player from their vehicle before killing them (fixes a crash when shuffling teams) --- qcsrc/server/g_damage.qc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 61b5add2bb..6686fb6955 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -588,6 +588,10 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float if(deathtype == DEATH_KILL || deathtype == DEATH_TEAMCHANGE || deathtype == DEATH_AUTOTEAMCHANGE) { + // exit the vehicle before killing (fixes a crash) + if(IS_PLAYER(targ) && targ.vehicle) + vehicles_exit(VHEF_RELESE); + // These are ALWAYS lethal // No damage modification here // Instead, prepare the victim for his death... -- 2.39.2