Synchronize changes from 1.6 master branch [ci skip]

github-actions[bot] · github-actions[bot] · commit 72a5256ee3b1 · 2025-07-03T16:08:21.000Z
deb9266 Fix missing onExplosion trigger for satchel charges (#4267)
diff --git a/Client/mods/deathmatch/logic/CClientPed.cpp b/Client/mods/deathmatch/logic/CClientPed.cpp
@@ -4970,7 +4970,10 @@ void CClientPed::DestroySatchelCharges(bool bBlow, bool bDestroy)
                 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);
+                }
             }
             if (bDestroy)
             {

Original file line number	Diff line number	Diff line change
`@@ -4970,7 +4970,10 @@ void CClientPed::DestroySatchelCharges(bool bBlow, bool bDestroy)`
`4970`	`4970`	`bool bCancelExplosion = !CallEvent("onClientExplosion", Arguments, true);`
`4971`	`4971`
`4972`	`4972`	`if (!bCancelExplosion)`
	`4973`	`+ {`
`4973`	`4974`	`m_pManager->GetExplosionManager()->Create(EXP_TYPE_GRENADE, vecPosition, this, true, -1.0f, false, WEAPONTYPE_REMOTE_SATCHEL_CHARGE);`
	`4975`	`+ g_pClientGame->SendExplosionSync(vecPosition, EXP_TYPE_GRENADE, this);`
	`4976`	`+ }`
`4974`	`4977`	`}`
`4975`	`4978`	`if (bDestroy)`
`4976`	`4979`	`{`