From 952a96c0f09ae22408b583858a925b2397717d9a Mon Sep 17 00:00:00 2001 From: Dark Blue Date: Mon, 7 Aug 2023 19:46:01 +0300 Subject: [PATCH] Nades: Improved onspawn nade refiring --- qcsrc/common/mutators/mutator/nades/nades.qc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc index 12997c0b5..eb7d1fa9b 100644 --- a/qcsrc/common/mutators/mutator/nades/nades.qc +++ b/qcsrc/common/mutators/mutator/nades/nades.qc @@ -1671,9 +1671,13 @@ MUTATOR_HOOKFUNCTION(nades, PlayerSpawn) { entity player = M_ARGV(0, entity); - player.nade_refire = (autocvar_g_nades_onspawn) - ? time + autocvar_g_nades_nade_refire - : time + autocvar_g_spawnshieldtime; + if (autocvar_g_nades_onspawn) + { + if (StatusEffects_active(STATUSEFFECT_SpawnShield, player)) + player.nade_refire = time + autocvar_g_spawnshieldtime; + } + else + player.nade_refire = time + autocvar_g_nades_nade_refire; if(autocvar_g_nades_bonus_client_select) STAT(NADE_BONUS_TYPE, player) = CS_CVAR(player).cvar_cl_nade_type; -- 2.39.2