]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Run the weapon frame after calling the weaponselect mutator hook, fixes mutators...
authorMario <mario@smbclan.net>
Mon, 25 Jun 2018 03:03:01 +0000 (13:03 +1000)
committerMario <mario@smbclan.net>
Mon, 25 Jun 2018 03:03:01 +0000 (13:03 +1000)
qcsrc/server/client.qc

index cf114e5f058860e6a55ef47febf11f0e17a31f63..43174dd5539253a0fbf4ebaaa7c7d0940ef37830 100644 (file)
@@ -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;