From 7d2099c284d4bfcab5b1b6cf2ca770cb9760f8e0 Mon Sep 17 00:00:00 2001 From: terencehill Date: Sun, 2 Dec 2012 22:54:59 +0100 Subject: [PATCH] Fix this bug: if you die when the countdown to be spectator is active above your head then you respawn immediately as dead throwing gibs instead of become spectator --- qcsrc/server/cl_player.qc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc index 2ba7311fa..07d9cece2 100644 --- a/qcsrc/server/cl_player.qc +++ b/qcsrc/server/cl_player.qc @@ -703,15 +703,15 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht //WriteAngle (MSG_ONE, 80); } - if(defer_ClientKill_Now_TeamChange) // TODO does this work with FreezeTag? - ClientKill_Now_TeamChange(); + if(defer_ClientKill_Now_TeamChange) + ClientKill_Now_TeamChange(); // can turn player into spectator if(g_arena) Spawnqueue_Unmark(self); // player could have been miraculously resuscitated ;) // e.g. players in freezetag get frozen, they don't really die - if(self.health >= 1) + if(self.health >= 1 || self.classname != "player") return; // when we get here, player actually dies -- 2.39.2