Synchronize changes from 1.6 master branch [ci skip]

github-actions[bot] · github-actions[bot] · commit bfccc4c5ee19 · 2025-09-23T18:39:22.000Z
72c5a92 Fix #4482 (onPlayerWasted not trigerring with setElementHealth to 0) (#4486)
diff --git a/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
@@ -1762,6 +1762,8 @@ bool CStaticFunctionDefinitions::SetElementHealth(CElement* pElement, float fHea
 
             if (pPed->IsDead() && fHealth > 0.0f)
                 pPed->SetIsDead(false);
+            else if (fHealth <= 0.0f && !pPed->IsDead())
+                KillPed(pElement, nullptr, 0xFF, 0xFF, false);
 
             break;
         }

Original file line number	Diff line number	Diff line change
`@@ -1762,6 +1762,8 @@ bool CStaticFunctionDefinitions::SetElementHealth(CElement* pElement, float fHea`
`1762`	`1762`
`1763`	`1763`	`if (pPed->IsDead() && fHealth > 0.0f)`
`1764`	`1764`	`pPed->SetIsDead(false);`
	`1765`	`+ else if (fHealth <= 0.0f && !pPed->IsDead())`
	`1766`	`+ KillPed(pElement, nullptr, 0xFF, 0xFF, false);`
`1765`	`1767`
`1766`	`1768`	`break;`
`1767`	`1769`	`}`