From c6e2ab9099786591e0b9721435b8fc2b53ae59fc Mon Sep 17 00:00:00 2001 From: Blixibon Date: Thu, 27 Nov 2025 00:34:04 -0600 Subject: [PATCH] Fix HolsterAndDestroyWeapon not working on players --- sp/src/game/server/basecombatcharacter.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sp/src/game/server/basecombatcharacter.cpp b/sp/src/game/server/basecombatcharacter.cpp index 668f1525eac..c576ded034f 100644 --- a/sp/src/game/server/basecombatcharacter.cpp +++ b/sp/src/game/server/basecombatcharacter.cpp @@ -4308,7 +4308,8 @@ void CBaseCombatCharacter::InputHolsterAndDestroyWeapon( inputdata_t &inputdata if (pWeapon->GetActivity() == ACT_VM_HOLSTER) { // Remove when holster is finished - pWeapon->ThinkSet( &CBaseEntity::SUB_Remove, gpGlobals->curtime + pWeapon->GetViewModelSequenceDuration() ); + pWeapon->SetThink( &CBaseEntity::SUB_Remove ); + pWeapon->SetNextThink( gpGlobals->curtime + pWeapon->GetViewModelSequenceDuration() ); } else {