From: Mario <mario.mario@y7mail.com>
Date: Mon, 27 Jul 2020 07:28:42 +0000 (+1000)
Subject: Merge branch 'master' into Mario/electro_combo_over_time
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bf4161ef3639ba716090dd4b31c104a8e1617126;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/electro_combo_over_time
---

bf4161ef3639ba716090dd4b31c104a8e1617126
diff --cc qcsrc/server/g_damage.qc
index e519a7a0e,626b3e5ac..22a45f235
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@@ -909,8 -910,8 +910,8 @@@ float RadiusDamageForSource (entity inf
  
  	total_damage_to_creatures = 0;
  
 -	if(deathtype != (WEP_HOOK.m_id | HITTYPE_SECONDARY | HITTYPE_BOUNCE)) // only send gravity bomb damage once
 +	if(deathtype != (WEP_HOOK.m_id | HITTYPE_SECONDARY | HITTYPE_BOUNCE) && deathtype != (WEP_ELECTRO.m_id | HITTYPE_BOUNCE | HITTYPE_SPLASH)) // only send damage over time bombs once
- 		if(DEATH_WEAPONOF(deathtype) != WEP_TUBA) // do not send tuba damage (bandwidth hog)
+ 		if(!(deathtype & HITTYPE_SOUND)) // do not send radial sound damage (bandwidth hog)
  		{
  			force = inflictorvelocity;
  			if(force == '0 0 0')