From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 2 Apr 2011 16:32:01 +0000 (+0300)
Subject: Skip the effect if the damage was not caused by a weapon
X-Git-Tag: xonotic-v0.6.0~110^2^2~179
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=08179f9ccc6e0a8450b27225c2133ba03f0f2241;p=xonotic%2Fxonotic-data.pk3dir.git

Skip the effect if the damage was not caused by a weapon
---

diff --git a/qcsrc/server/g_violence.qc b/qcsrc/server/g_violence.qc
index d863669bb..7f17739aa 100644
--- a/qcsrc/server/g_violence.qc
+++ b/qcsrc/server/g_violence.qc
@@ -83,9 +83,10 @@ void Violence_DamageEffect_SetRepeat(entity pl, float type)
 {
 	if(sv_gentle)
 		return;
-	// return if we already have a damage effect active, else too many damage effects get spammed
+	if(!type)
+		return; // return if the damage was not caused by a weapon
 	if(pl.player_damageeffect_active)
-		return;
+		return; // return if we already have a damage effect active, else too many damage effects get spammed
 
 	entity repeater;
 	repeater = spawn();