]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Initially don't alter damage with teamplay rules if it's dealt to a frozen player...
authorterencehill <piuntn@gmail.com>
Mon, 25 Feb 2019 20:49:58 +0000 (21:49 +0100)
committerterencehill <piuntn@gmail.com>
Mon, 25 Feb 2019 20:49:58 +0000 (21:49 +0100)
qcsrc/server/g_damage.qc

index 0901ab44780555d28da3646ef409a62741981321..8020b120da766ddd2bcc0c86db434d1242b42efe 100644 (file)
@@ -613,7 +613,7 @@ void Damage(entity targ, entity inflictor, entity attacker, float damage, int de
                                damage = 0;
                                force = '0 0 0';
                        }
-                       else if(SAME_TEAM(attacker, targ))
+                       else if(!STAT(FROZEN, targ) && SAME_TEAM(attacker, targ))
                        {
                                if(autocvar_teamplay_mode == 1)
                                        damage = 0;