From 95ceee2a54ae242af4d55c128e5fa831c5ccb81b Mon Sep 17 00:00:00 2001
From: thilo <thilo@edf5b092-35ff-0310-97b2-ce42778d08ea>
Date: Tue, 6 Oct 2009 14:10:45 +0000
Subject: Don't award assist bonuses to flag capturing player,
 https://bugzilla.icculus.org/show_bug.cgi?id=3260

git-svn-id: svn://svn.icculus.org/quake3/trunk@1644 edf5b092-35ff-0310-97b2-ce42778d08ea
---
 code/game/g_team.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/game/g_team.c b/code/game/g_team.c
index ca5341d..4bcd5bd 100644
--- a/code/game/g_team.c
+++ b/code/game/g_team.c
@@ -770,7 +770,9 @@ int Team_TouchOurFlag( gentity_t *ent, gentity_t *other, int team ) {
 	// Ok, let's do the player loop, hand out the bonuses
 	for (i = 0; i < g_maxclients.integer; i++) {
 		player = &g_entities[i];
-		if (!player->inuse)
+
+		// also make sure we don't award assist bonuses to the flag carrier himself.
+		if (!player->inuse || player == other)
 			continue;
 
 		if (player->client->sess.sessionTeam !=
-- 
cgit v1.2.3