]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
LMS: Apply INGAME_STATUS_JOINED when players are reset
authorterencehill <piuntn@gmail.com>
Tue, 4 Jan 2022 18:29:37 +0000 (19:29 +0100)
committerterencehill <piuntn@gmail.com>
Tue, 4 Jan 2022 18:29:37 +0000 (19:29 +0100)
qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc

index 76a565016498955304efaf66f1d90dc5090906a1..c8cc0e6e565751b75aa3919ffeb4b4ddf3095f51 100644 (file)
@@ -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)
        {