X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_damage.qc;h=d27c31a6aafec21f2fe5ee23e5eaf14488573d2a;hp=60b0bd408d05adb5a0d70b83d84df2a8c117f7ad;hb=3f0620ef10b0c142cfb2f64d87af78c1243766c6;hpb=94db0bdbb20203c5675c8e6f1ab3bdf6a105b20f;ds=inline

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 60b0bd408d..d27c31a6aa 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -789,9 +789,8 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 				{
 					if(damage > 0)
 					{
-						if(attacker.weapon != WEP_LASER
-						&& (attacker.weapon != WEP_ELECTRO || !autocvar_g_balance_electro_lightning)
-						&& attacker.prevhitsound + autocvar_sv_hitsound_antispam_time < time)
+						if(deathtype != DEATH_FIRE)
+						if(attacker.prevhitsound + autocvar_sv_hitsound_antispam_time < time)
 						{
 							if(targ.BUTTON_CHAT)
 								attacker.typehitsound += 1;
@@ -823,8 +822,8 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 				}
 				else
 				{
-					if(deathtype != DEATH_FIRE
-					&& attacker.prevhitsound + autocvar_sv_hitsound_antispam_time < time)
+					if(deathtype != DEATH_FIRE)
+					if(attacker.prevhitsound + autocvar_sv_hitsound_antispam_time < time)
 					{
 						attacker.typehitsound += 1;
 						attacker.prevhitsound = time;