X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fplayer.qc;h=26fc9e659204d7bf6305a5d2483bf1b2b4ba9819;hp=d9226f3437e351bec049ea26b5747b333f2530ad;hb=d865de7a9a17c5a1d9286aec40f68c3530697660;hpb=77acc848d2d308331349c2d86480b74f5029fcd1

diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc
index d9226f343..26fc9e659 100644
--- a/qcsrc/server/player.qc
+++ b/qcsrc/server/player.qc
@@ -517,7 +517,7 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
 
 		if(this.alivetime)
 		{
-			PS_GR_P_ADDVAL(this, PLAYERSTATS_ALIVETIME, time - this.alivetime);
+			PlayerStats_GameReport_Event_Player(this, PLAYERSTATS_ALIVETIME, time - this.alivetime);
 			this.alivetime = 0;
 		}
 
@@ -538,7 +538,7 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
 		{
 			delete(this.killindicator);
 			this.killindicator = NULL;
-			if(CS(this).killindicator_teamchange)
+			if(this.killindicator_teamchange)
 				defer_ClientKill_Now_TeamChange = true;
 
 			if(this.classname == "body")
@@ -558,6 +558,7 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
 		if(w != WEP_Null && accuracy_isgooddamage(attacker, this))
 			CS(attacker).accuracy.(accuracy_frags[w.m_id-1]) += 1;
 
+		this.respawn_time = 0;
 		MUTATOR_CALLHOOK(PlayerDies, inflictor, attacker, this, deathtype, damage);
 		damage = M_ARGV(4, float);
 		excess = max(0, damage - take - save);
@@ -586,6 +587,9 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
 		if(this.health >= 1 || !(IS_PLAYER(this) || this.classname == "body"))
 			return;
 
+		if (!this.respawn_time) // can be set in the mutator hook PlayerDies
+			calculate_player_respawn_time(this);
+
 		// when we get here, player actually dies
 
 		Unfreeze(this); // remove any icy remains
@@ -621,9 +625,6 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
 
 		STAT(MOVEVARS_SPECIALCOMMAND, this) = false; // sweet release
 
-		// when to allow respawn
-		calculate_player_respawn_time(this);
-
 		this.death_time = time;
 		if (random() < 0.5)
 			animdecide_setstate(this, this.anim_state | ANIMSTATE_DEAD1, true);