From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 23 Sep 2010 16:14:53 +0000 (+0300)
Subject: Fix a bug from Nexuiz that would cause a bot's team overrider to be ignored in Clan... 
X-Git-Tag: xonotic-v0.1.0preview~308^2^2~5^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dfd6cc0f2b3a005075fef93a4275047b4bab9aab;p=xonotic%2Fxonotic-data.pk3dir.git

Fix a bug from Nexuiz that would cause a bot's team overrider to be ignored in Clan Arena between rounds (the bot would be assigned to the smallest team after the first round, regardless of his team overrider).
---

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index 2a08ec5cf..e0a7289b4 100644
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -938,7 +938,7 @@ float JoinBestTeam(entity pl, float only_return_best, float forcebestteam)
 
 	smallest = FindSmallestTeam(pl, TRUE);
 
-	if(!only_return_best)
+	if(!only_return_best && !pl.bot_forced_team)
 	{
 		TeamchangeFrags(self);
 		if(smallest == 1)