Merge remote-tracking branch 'origin/master' into samual/update_effects_tab

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / mutator_vampire.qc

diff --git a/qcsrc/server/mutators/mutator_vampire.qc b/qcsrc/server/mutators/mutator_vampire.qc
index 7e253ddf9dafbe3f50f3d247890e8573edb841bf..1aa293b39ea260efd53f3c7a80cf1325ea749d32 100644 (file)
--- a/qcsrc/server/mutators/mutator_vampire.qc
+++ b/qcsrc/server/mutators/mutator_vampire.qc
@@ -5,12 +5,13 @@ MUTATOR_HOOKFUNCTION(vampire_PlayerDamage)
        if(g_minstagib)
        {
                // minstagib: each hit means +1 ammo
-               frag_attacker.ammo_cells += 2; // note: 1 cell was deducted for the shot
+               if(frag_attacker != frag_target)
+                       frag_attacker.ammo_cells += 2; // note: 1 cell was deducted for the shot
        }
        else
        {
                // otherwise: each hit gets damage back
-               frag_attacker.health += damage_take;
+               frag_attacker.health = frag_attacker.health + bound(0, damage_take, self.health);
        }
        return 0;
 }