From: terencehill <piuntn@gmail.com>
Date: Sun, 28 Oct 2018 14:48:08 +0000 (+0100)
Subject: Fix #2126 "g_keepaway_noncarrier_damage disables damage by map objects"
X-Git-Tag: xonotic-v0.8.5~1739
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=960d524193f1646c069df489e7d2eae3adabc408;p=xonotic%2Fxonotic-data.pk3dir.git

Fix #2126 "g_keepaway_noncarrier_damage disables damage by map objects"
---

diff --git a/qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc b/qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc
index 66acc2e45..0b8144deb 100644
--- a/qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc
+++ b/qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc
@@ -394,7 +394,7 @@ MUTATOR_HOOKFUNCTION(ka, Damage_Calculate) // for changing damage and force valu
 			frag_force *= autocvar_g_keepaway_ballcarrier_force;
 		}
 	}
-	else if (!frag_target.ballcarried) // if the target is a noncarrier
+	else if (IS_PLAYER(frag_attacker) && !frag_target.ballcarried) // if the target is a noncarrier
 	{
 		if(frag_target == frag_attacker) // damage done to yourself
 		{