From: terencehill Date: Wed, 27 Jan 2021 16:22:32 +0000 (+0100) Subject: Stop reviving progress and forbid throwing weapons and nades during the countdown... X-Git-Tag: xonotic-v0.8.5~587 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1c8078526dc9f67524c2ec7f4c091059ce9a75ed;p=xonotic%2Fxonotic-data.pk3dir.git Stop reviving progress and forbid throwing weapons and nades during the countdown to game start --- diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index 69e36d7c4..048d606bb 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -2498,7 +2498,7 @@ void PlayerPreThink (entity this) this.max_armorvalue = 0; } - if (frametime && IS_PLAYER(this)) + if (frametime && IS_PLAYER(this) && time >= game_starttime) { if (STAT(FROZEN, this) == FROZEN_TEMP_REVIVING) { diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc index db89ffc44..1b3bb661c 100644 --- a/qcsrc/server/weapons/throwing.qc +++ b/qcsrc/server/weapons/throwing.qc @@ -149,6 +149,8 @@ void W_ThrowWeapon(entity this, .entity weaponentity, vector velo, vector delta, Weapon w = this.(weaponentity).m_weapon; if (w == WEP_Null) return; // just in case + if (time < game_starttime) + return; if(MUTATOR_CALLHOOK(ForbidThrowCurrentWeapon, this, this.(weaponentity))) return; if(!autocvar_g_weapon_throwable)