Fix #2126 "g_keepaway_noncarrier_damage disables damage by map objects"

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / gamemodes / gamemode / keepaway / sv_keepaway.qc

diff --git a/qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc b/qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc
index 66acc2e455944eaddacb4df266d8da55e968a8ee..0b8144deb7d5ae5cf147f2a326bbc727a55510c5 100644 (file)
--- 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
                {