From: terencehill <piuntn@gmail.com>
Date: Sat, 16 Feb 2019 23:08:47 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Tag: xonotic-v0.8.5~1600
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=797bf448a96c0c13d783c7c919bb2caf6fa16707;hp=057a30619b24b998bb9502aaaf6fd4fc757f9979

Merge branch 'master' into 'master'

Fix crash when g_maxplayers smaller than current amount of active players

See merge request xonotic/xonotic-data.pk3dir!637
---

diff --git a/qcsrc/server/bot/default/bot.qc b/qcsrc/server/bot/default/bot.qc
index 03f539383..3911d596d 100644
--- a/qcsrc/server/bot/default/bot.qc
+++ b/qcsrc/server/bot/default/bot.qc
@@ -613,7 +613,7 @@ bool bot_fixcount()
 		// cap bots to the max players allowed by the server
 		int player_limit = GetPlayerLimit();
 		if(player_limit)
-			bots = min(bots, player_limit - activerealplayers);
+			bots = min(bots, max(player_limit - activerealplayers, 0));
 		bots = min(bots, maxclients - realplayers);
 
 		if(bots > minbots)
@@ -636,7 +636,7 @@ bool bot_fixcount()
 				return false;
 			}
 		}
-		while (currentbots > bots)
+		while (currentbots > bots && bots >= 0)
 			bot_removenewest();
 	}