]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Skip the effect if the damage was not caused by a weapon
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 2 Apr 2011 16:32:01 +0000 (19:32 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 2 Apr 2011 16:32:01 +0000 (19:32 +0300)
qcsrc/server/g_violence.qc

index d863669bb0b79f11a045a33c7363516a807a6de5..7f17739aa5d8e8bff4e10236489825da6772c4a1 100644 (file)
@@ -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();