Don't check the warmup stage to see if armor is enabled on the server. That check...

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 8f058155c16a32c95245724dd31d9a967fafb382..ef0e2db067f0997ce75c0647f4884ee18ee7ec05 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -1047,7 +1047,7 @@ float ClientInit_SendEntity(entity to, float sf)
 \r
        // tell the client if this server uses armor\r
        float armor_enabled;\r
-       if(cvar("g_balance_armor_start") || (cvar("g_lms") && cvar("g_lms_start_armor")) || (inWarmupStage && cvar("g_warmup_start_armor")) || cvar("g_balance_armor_regen") || cvar("g_balance_armor_regenlinear"))\r
+       if(cvar("g_balance_armor_start") || (cvar("g_lms") && cvar("g_lms_start_armor")) /*|| (inWarmupStage && cvar("g_warmup_start_armor"))*/ || cvar("g_balance_armor_regen") || cvar("g_balance_armor_regenlinear"))\r
                armor_enabled = TRUE;\r
        WriteByte(MSG_ENTITY, armor_enabled);\r
 \r