X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator_vampire.qc;h=edfcba4398d2da3eff0d465ecb03ef341fe37f75;hb=a7794afc2db05650096d9c22e55cb1ca6d82aa9b;hp=40a925b3ce835fbc24c9b64f424d9022690dd0bc;hpb=b2b28d307aa8f0848f2c10f23c52d36b53d10646;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/mutator_vampire.qc b/qcsrc/server/mutators/mutator_vampire.qc
index 40a925b3c..edfcba439 100644
--- a/qcsrc/server/mutators/mutator_vampire.qc
+++ b/qcsrc/server/mutators/mutator_vampire.qc
@@ -1,18 +1,14 @@
 MUTATOR_HOOKFUNCTION(vampire_PlayerDamage)
 {
-	if(time < self.spawnshieldtime)
-		return 0;
-	if(g_minstagib)
+	if(time >= frag_target.spawnshieldtime)
+	if(frag_target != frag_attacker)
+	if(frag_target.deadflag == DEAD_NO)
 	{
-		// minstagib: each hit means +1 ammo
-		frag_attacker.ammo_cells += 2; // note: 1 cell was deducted for the shot
+		frag_attacker.health += bound(0, damage_take, frag_target.health);
+		frag_attacker.health = bound(0, frag_attacker.health, autocvar_g_balance_health_limit);
 	}
-	else
-	{
-		// otherwise: each hit gets damage back
-		frag_attacker.health = frag_attacker.health + bound(0, damage_take, self.health);
-	}
-	return 0;
+		
+	return FALSE;
 }
 
 MUTATOR_HOOKFUNCTION(vampire_BuildMutatorsString)