Merge branch 'master' into Mario/monsters

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

diff --git a/qcsrc/server/accuracy.qc b/qcsrc/server/accuracy.qc
index aca64a431a55d2b474bb6322f4284a522b51a98d..9d54fad4a05c69b60e73fa5d24113336ebd6bb46 100644 (file)
--- a/qcsrc/server/accuracy.qc
+++ b/qcsrc/server/accuracy.qc
@@ -109,8 +109,11 @@ void accuracy_add(entity e, float w, float fired, float hit)
 
 float accuracy_isgooddamage(entity attacker, entity targ)
 {
+       float targ_isvalid = ((g_invasion) ? targ.flags & FL_MONSTER : IS_CLIENT(targ));
+
        if(!warmup_stage)
-       if(IS_CLIENT(targ))
+       if(targ_isvalid)
+       if(!targ.frozen)
        if(targ.deadflag == DEAD_NO)
        if(DIFF_TEAM(attacker, targ))
                return TRUE;