Fix this bug: if you die when the countdown to be spectator is active above your...

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 2ba7311fa6bbbfe9c40c928251ce720d04078063..07d9cece2596f271c7d4acad460a3d55902d4f39 100644 (file)
--- 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