From 670041d9c9079de26d56ab4b769150c4118d545e Mon Sep 17 00:00:00 2001 From: Sergey Shorokhov Date: Sat, 3 Aug 2024 00:24:46 +0300 Subject: [PATCH] `CBasePlayerAmmo`: check spawnflags on `Spawn()` --- regamedll/dlls/ammo.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/regamedll/dlls/ammo.cpp b/regamedll/dlls/ammo.cpp index bfef8749e..1df3622cc 100644 --- a/regamedll/dlls/ammo.cpp +++ b/regamedll/dlls/ammo.cpp @@ -10,7 +10,11 @@ void CBasePlayerAmmo::Spawn() SetTouch(&CBasePlayerAmmo::DefaultTouch); - if (g_pGameRules->IsMultiplayer()) + if (g_pGameRules->IsMultiplayer() +#ifdef REGAMEDLL_FIXES + && g_pGameRules->AmmoShouldRespawn(this) == GR_AMMO_RESPAWN_NO +#endif + ) { SetThink(&CBaseEntity::SUB_Remove); pev->nextthink = gpGlobals->time + 2.0f;