]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
do not give damage score when shooting teammates 599/head
authorpacker <itsme.xonotic@ymail.com>
Sat, 22 Sep 2018 11:43:49 +0000 (13:43 +0200)
committerpacker <itsme.xonotic@ymail.com>
Sat, 22 Sep 2018 12:18:12 +0000 (14:18 +0200)
qcsrc/server/player.qc

index 87005ad4bbf6c0476dab47635e1a34c8db616e04..32515c048ecea7dac6205be6e5aa1b7ad4979201 100644 (file)
@@ -468,7 +468,7 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
 
                        if (this != attacker) {
                                float realdmg = damage - excess;
-                               if (IS_PLAYER(attacker)) {
+                               if (IS_PLAYER(attacker) && !SAME_TEAM(attacker, this)) {
                                        GameRules_scoring_add(attacker, DMG, realdmg);
                                }
                                if (IS_PLAYER(this)) {