X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fplayer.qc;h=1be6b62a3f2b8903775047ab2af91d2fdb758d2e;hb=6c4bdd5eeea06db69a457997de24bef84b4eaf93;hp=a632aab01c7625452f5ff887bd21fb578cf43f43;hpb=bca355b90c59de6914601c65e48f2f6db975f066;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc
index a632aab01..1be6b62a3 100644
--- a/qcsrc/server/player.qc
+++ b/qcsrc/server/player.qc
@@ -247,7 +247,12 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
 			}
 		}
 
-		if (time < this.spawnshieldtime && autocvar_g_spawnshield_blockdamage < 1)
+		if (STAT(FROZEN, this))
+		{
+			if (!ITEM_DAMAGE_NEEDKILL(deathtype))
+				damage = 0;
+		}
+		else if (time < this.spawnshieldtime && autocvar_g_spawnshield_blockdamage < 1)
 			damage *= 1 - max(0, autocvar_g_spawnshield_blockdamage);
 
 		if(deathtype & HITTYPE_SOUND) // sound based attacks cause bleeding from the ears
@@ -342,7 +347,7 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
 			if(take)
 				this.pauseregen_finished = max(this.pauseregen_finished, time + autocvar_g_balance_pause_health_regen);
 
-			if (time > this.pain_finished)		//Don't switch pain sequences like crazy
+			if (time > this.pain_finished && !STAT(FROZEN, this)) // Don't switch pain sequences like crazy
 			{
 				this.pain_finished = time + 0.5;	//Supajoe
 
@@ -388,8 +393,8 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
 			}
 
 			float realdmg = damage - excess;
-			if (this != attacker && realdmg)
-			if (!(round_handler_IsActive() && !round_handler_IsRoundStarted()) && time >= game_starttime)
+			if (this != attacker && realdmg && !STAT(FROZEN, this)
+				&& (!(round_handler_IsActive() && !round_handler_IsRoundStarted()) && time >= game_starttime))
 			{
 				if (IS_PLAYER(attacker) && DIFF_TEAM(attacker, this)) {
 					GameRules_scoring_add(attacker, DMG, realdmg);
@@ -416,7 +421,7 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
 	if(vbot || IS_REAL_CLIENT(this))
 	if(abot || IS_REAL_CLIENT(attacker))
 	if(attacker && this != attacker)
-	if(DIFF_TEAM(this, attacker))
+	if (DIFF_TEAM(this, attacker) && (!STAT(FROZEN, this) || this.freeze_time > time))
 	{
 		if(DEATH_ISSPECIAL(deathtype))
 			awep = attacker.(weaponentity).m_weapon;
@@ -425,8 +430,8 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
 		valid_damage_for_weaponstats = true;
 	}
 
-	dh = dh - max(GetResource(this, RES_HEALTH), 0);
-	da = da - max(GetResource(this, RES_ARMOR), 0);
+	dh -= max(GetResource(this, RES_HEALTH), 0); // health difference
+	da -= max(GetResource(this, RES_ARMOR), 0); // armor difference
 	if(valid_damage_for_weaponstats)
 	{
 		WeaponStats_LogDamage(awep.m_id, abot, this.(weaponentity).m_weapon.m_id, vbot, dh + da);