From: terencehill <piuntn@gmail.com>
Date: Sat, 15 Nov 2014 00:44:18 +0000 (+0100)
Subject: Don't execute bot code when bots are forced observer. In CA it allowed bots added... 
X-Git-Tag: xonotic-v0.8.0~126^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0c3acdf57b857a44592d7ecd11b8a5be35c38578;p=xonotic%2Fxonotic-data.pk3dir.git

Don't execute bot code when bots are forced observer. In CA it allowed bots added in the middle of a round to join the game at the first jump (!).
---

diff --git a/qcsrc/server/bot/bot.qc b/qcsrc/server/bot/bot.qc
index b93d87ad2..40b769ddd 100644
--- a/qcsrc/server/bot/bot.qc
+++ b/qcsrc/server/bot/bot.qc
@@ -43,7 +43,7 @@ void bot_think()
 	//self.bot_painintensity = self.bot_painintensity + self.bot_oldhealth - self.health;
 	//self.bot_painintensity = bound(0, self.bot_painintensity, 100);
 
-	if (autocvar_g_campaign && !campaign_bots_may_start)
+	if (!IS_PLAYER(self) || (autocvar_g_campaign && !campaign_bots_may_start))
 	{
 		self.bot_nextthink = time + 0.5;
 		return;