X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_damage.qc;fp=qcsrc%2Fserver%2Fg_damage.qc;h=49be7c4c3dcfd35f78308e3e0023b59f2765de47;hp=1b8f838aa43d0bd4d4d9ac31742da5f5e382d432;hb=6ef47f8b74f77d02cd737614fac3c025f63e789b;hpb=81f13280adb5d314fb3f59ab34774f145171fd35

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 1b8f838aa4..49be7c4c3d 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -808,7 +808,9 @@ void Damage(entity targ, entity inflictor, entity attacker, float damage, int de
 				}
 				else if(IS_PLAYER(attacker))
 				{
-					if(deathtype != DEATH_FIRE.m_id)
+					// if enemy gets frozen in this frame and receives other damage don't
+					// play the typehitsound e.g. when hit by multiple bullets of the shotgun
+					if (deathtype != DEATH_FIRE.m_id && (!STAT(FROZEN, victim) || time > victim.freeze_time))
 					{
 						attacker.typehitsound += 1;
 					}