X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Farena.qc;h=ef81fd92bad7db138edb2fa1e1067d252bae875b;hb=fe918a703a56450ef0067294d58bd77d7de89517;hp=6dc7593b28e80ffa94fcf1941dec36c593d53dde;hpb=2726deea1aee754fb5a5a1deed898e44b5a7822f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc
index 6dc7593b2..ef81fd92b 100644
--- a/qcsrc/server/arena.qc
+++ b/qcsrc/server/arena.qc
@@ -47,7 +47,7 @@ void reset_map(float dorespawn)
 	race_ReadyRestart();
 
 	for(self = world; (self = nextent(self)); )
-	if(clienttype(self) == CLIENTTYPE_NOTACLIENT && self.items != IT_STRENGTH && self.items != IT_INVINCIBLE) // don't respawn strength or shield, that will only lead to them spawning very early each match
+	if(clienttype(self) == CLIENTTYPE_NOTACLIENT)
 	{
 		if(self.reset)
 		{
@@ -382,7 +382,7 @@ void count_alive_players()
  */
 void Spawnqueue_Check()
 {
-	if(warmup == 0 && g_ca)
+	if(warmup == 0 && g_ca && !inWarmupStage)
 	{
 		if(red_players || blue_players)
 			reset_map(TRUE);