Skip to content

Fixes #4337 - Fix duplicate onClientExplosion events for satchel #4340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Fixes #4337 - Fix duplicate onClientExplosion events for satchel #4340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
330f7b8
Refactor CClientPed::DestroySatchelCharges
MohabCodeX Aug 4, 2025
aee256d
Merge branch 'master' into fix/satchel-trigger-twice
MohabCodeX Aug 5, 2025
8748373
remove redundant explosion sync call
MohabCodeX Aug 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Client/mods/deathmatch/logic/CClientExplosionManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,12 @@ bool CClientExplosionManager::Hook_ExplosionCreation(CEntity* pGameExplodingEnti
// Determine the used weapon
eWeaponType explosionWeaponType = WEAPONTYPE_EXPLOSION;

switch (explosionType)
// Use stored weapon type if available
if (m_LastWeaponType != WEAPONTYPE_UNARMED && m_pLastCreator == pResponsible)
explosionWeaponType = m_LastWeaponType;
else
{
switch (explosionType)
{
case EXP_TYPE_GRENADE:
{
Expand All @@ -82,6 +87,7 @@ bool CClientExplosionManager::Hook_ExplosionCreation(CEntity* pGameExplodingEnti
break;
default:
break;
}
}

// Handle this explosion client side only if entity is local or breakable (i.e. barrel)
Expand Down
13 changes: 1 addition & 12 deletions Client/mods/deathmatch/logic/CClientPed.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4979,18 +4979,7 @@ void CClientPed::DestroySatchelCharges(bool bBlow, bool bDestroy)
if (bBlow)
{
pProjectile->GetPosition(vecPosition);
CLuaArguments Arguments;
Arguments.PushNumber(vecPosition.fX);
Arguments.PushNumber(vecPosition.fY);
Arguments.PushNumber(vecPosition.fZ);
Arguments.PushNumber(EXP_TYPE_GRENADE);
bool bCancelExplosion = !CallEvent("onClientExplosion", Arguments, true);

if (!bCancelExplosion)
{
m_pManager->GetExplosionManager()->Create(EXP_TYPE_GRENADE, vecPosition, this, true, -1.0f, false, WEAPONTYPE_REMOTE_SATCHEL_CHARGE);
g_pClientGame->SendExplosionSync(vecPosition, EXP_TYPE_GRENADE, this);
}
m_pManager->GetExplosionManager()->Create(EXP_TYPE_GRENADE, vecPosition, this, true, -1.0f, false, WEAPONTYPE_REMOTE_SATCHEL_CHARGE);
}
if (bDestroy)
{
Expand Down