Synchronize changes from 1.6 master branch [ci skip]

612f9a6 Fixed element health issues (#3633)

Author: github-actions[bot]

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -1465,13 +1465,8 @@ bool CStaticFunctionDefinitions::SetElementHealth(CClientEntity& Entity, float f
             // Grab the model
             CClientPed& Ped = static_cast<CClientPed&>(Entity);
 
-            // Limit to max health
-            float fMaxHealth = Ped.GetMaxHealth();
-            if (fHealth > fMaxHealth)
-                fHealth = fMaxHealth;
-
             // Set the new health
-            Ped.SetHealth(fHealth);
+            Ped.SetHealth(Clamp(0.0f, fHealth, Ped.GetMaxHealth()));
             return true;
             break;
         }

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -1654,27 +1654,15 @@ bool CStaticFunctionDefinitions::SetElementHealth(CElement* pElement, float fHea
         case CElement::PLAYER:
         {
             CPed* pPed = static_cast<CPed*>(pElement);
-            if (pPed->IsSpawned())
-            {
-                // Limit their max health to what the stat says
-                float fMaxHealth = pPed->GetMaxHealth();
-                if (fHealth > fMaxHealth)
-                    fHealth = fMaxHealth;
+            if (!pPed->IsSpawned())
+                return false;
 
-                // Do not set the health below zero
-                if (fHealth < 0.0f)
-                    fHealth = 0.0f;
+            fHealth = Clamp(0.0f, fHealth, pPed->GetMaxHealth());
+            pPed->SetHealth(fHealth);
 
-                // This makes sure the health is set to what will get reported
-                unsigned char ucHealth = static_cast<unsigned char>(fHealth * 1.25f);
-                fHealth = static_cast<float>(ucHealth) / 1.25f;
-                pPed->SetHealth(fHealth);
+            if (pPed->IsDead() && fHealth > 0.0f)
+                pPed->SetIsDead(false);
 
-                if (pPed->IsDead() && fHealth > 0.0f)
-                    pPed->SetIsDead(false);
-            }
-            else
-                return false;
             break;
         }
         case CElement::VEHICLE: