From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 23 Sep 2010 16:01:19 +0000 (+0300)
Subject: Fix a bug (apparently from Nexuiz) that would cause a bot's team overrider to be... 
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=22f0de3a637faff0746b652e3657ec271f8646a6;p=voretournament%2Fvoretournament.git

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

diff --git a/data/qcsrc/server/teamplay.qc b/data/qcsrc/server/teamplay.qc
index c829326c..c2daf081 100644
--- a/data/qcsrc/server/teamplay.qc
+++ b/data/qcsrc/server/teamplay.qc
@@ -886,7 +886,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)