From bd214c56bec96e4d4098de002f959dcad7998804 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 25 Jun 2018 13:03:01 +1000 Subject: [PATCH] Run the weapon frame after calling the weaponselect mutator hook, fixes mutators that change held weapon on spawn --- qcsrc/server/client.qc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index cf114e5f0..43174dd55 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -750,12 +750,16 @@ void PutPlayerInServer(entity this) this.(weaponentity).weaponname = ""; this.(weaponentity).m_switchingweapon = WEP_Null; this.(weaponentity).cnt = -1; - - W_WeaponFrame(this, weaponentity); } MUTATOR_CALLHOOK(PlayerWeaponSelect, this); + for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) + { + .entity weaponentity = weaponentities[slot]; + W_WeaponFrame(this, weaponentity); + } + if (!warmup_stage && !this.alivetime) this.alivetime = time; -- 2.39.2