Add ForbidThrowCurrentWeapon hook to CA and cleanup some checks

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

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 1e7d2815d501af4bc8bb9d1df2177e7b13bbbcdb..0528c7dbcf6867e71982e60c3a0c65c9849e768f 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -131,9 +131,8 @@ void GiveFrags (entity attacker, entity targ, float f, float deathtype)
 
        PlayerScore_Add(targ, SP_DEATHS, 1);
 
-       if(g_arena || g_ca)
-               if(autocvar_g_arena_roundbased)
-                       return;
+       if(g_arena && arena_roundbased)
+               return;
 
        if(targ != attacker) // not for suicides
        if(g_weaponarena_random)