From: terencehill <piuntn@gmail.com>
Date: Tue, 4 Jan 2022 18:29:37 +0000 (+0100)
Subject: LMS: Apply INGAME_STATUS_JOINED when players are reset
X-Git-Tag: xonotic-v0.8.5~245
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4a3a576f798b55950cae83a174c5bd9e74111ea5;p=xonotic%2Fxonotic-data.pk3dir.git

LMS: Apply INGAME_STATUS_JOINED when players are reset
---

diff --git a/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc b/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
index 76a565016..c8cc0e6e5 100644
--- a/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
+++ b/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
@@ -163,7 +163,10 @@ bool lms_AddPlayer(entity player)
 		int lives = GameRules_scoring_add(player, LMS_LIVES, LMS_NewPlayerLives());
 		if(lives <= 0)
 			return false;
-		INGAME_STATUS_SET(player, INGAME_STATUS_JOINING); // this is just to delay setting health and armor that can't be done here
+		if (time < game_starttime)
+			INGAME_STATUS_SET(player, INGAME_STATUS_JOINED);
+		else
+			INGAME_STATUS_SET(player, INGAME_STATUS_JOINING); // this is just to delay setting health and armor that can't be done here
 	}
 	if (warmup_stage || time <= game_starttime)
 	{