Merge branch 'master' into terencehill/music_player

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / bot / bot.qc

diff --git a/qcsrc/server/bot/bot.qc b/qcsrc/server/bot/bot.qc
index b93d87ad29f229736686045c546f26d0af1101a6..40b769ddd3fb4a78f3b156995a2cf53153800869 100644 (file)
--- 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;