X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fclient.qc;fp=qcsrc%2Fserver%2Fclient.qc;h=6d8ef921b1f4b9bc0679cb97feb3ed7aafe7c0d1;hb=c88915306c11c228f92e605482ff612b59469910;hp=f27a4e2a7b0185e657e79cae19326a87c35d34c5;hpb=7e08fc9d61c6f434a3ad35775e7f4b94464d5470;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index f27a4e2a7..6d8ef921b 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -812,7 +812,7 @@ void PutPlayerInServer(entity this)
 
 	antilag_clear(this, CS(this));
 
-	if (warmup_stage == -1)
+	if (warmup_stage < 0 || warmup_stage > 1)
 		ReadyCount();
 }
 
@@ -1042,7 +1042,7 @@ void SendWelcomeMessage(entity this, int msg_type)
 	WriteString(msg_type, autocvar_g_xonoticversion);
 	WriteByte(msg_type, CS(this).version_mismatch);
 	WriteByte(msg_type, (CS(this).version < autocvar_gameversion));
-	WriteByte(msg_type, map_minplayers);
+	WriteByte(msg_type, autocvar_g_warmup > 1 ? autocvar_g_warmup : map_minplayers);
 	WriteByte(msg_type, GetPlayerLimit());
 
 	MUTATOR_CALLHOOK(BuildMutatorsPrettyString, "");