]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix a bug from Nexuiz that would cause a bot's team overrider to be ignored in Clan...
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 23 Sep 2010 16:14:53 +0000 (19:14 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 23 Sep 2010 16:14:53 +0000 (19:14 +0300)
qcsrc/server/teamplay.qc

index 2a08ec5cf9d7d56379eee6ace2e347944bb91cfe..e0a7289b4e9c095ae37d72810186e9a77f8bc067 100644 (file)
@@ -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)