From: packer <itsme.xonotic@ymail.com>
Date: Sat, 22 Sep 2018 11:43:49 +0000 (+0200)
Subject: do not give damage score when shooting teammates
X-Git-Tag: xonotic-v0.8.5~1832^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F599%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

do not give damage score when shooting teammates
---

diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc
index 87005ad4b..32515c048 100644
--- a/qcsrc/server/player.qc
+++ b/qcsrc/server/player.qc
@@ -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)) {