Fix invincible peds

Client/mods/deathmatch/logic/CClientPed.cpp

@@ -1732,8 +1732,15 @@ void CClientPed::InternalSetHealth(float fHealth)
         // Recheck we have a ped, ReCreateModel might destroy it
         if (m_pPlayerPed)
         {
+            // update dead state for peds
+            if (fHealth > 0 && IsDead())
+            {
+                m_bDead = false;
+            }
+
             // Set the new health
             m_pPlayerPed->SetHealth(fHealth);
+            m_pTaskManager->RemoveTask(TASK_SIMPLE_DEAD);
         }
     }
 }
@@ -1880,16 +1887,10 @@ void CClientPed::Kill(eWeaponType weaponType, unsigned char ucBodypart, bool bSt
             }
         }
     }
-    if (m_bIsLocalPlayer)
-    {
-        SetHealth(0.0f);
-        SetArmor(0.0f);
-    }
-    else
-    {
-        LockHealth(0.0f);
-        LockArmor(0.0f);
-    }
+
+    // set health and armor to 0
+    SetHealth(0.0f);
+    SetArmor(0.0f);
 
     // Silently remove the ped satchels
     DestroySatchelCharges(false, true);

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -1535,6 +1535,13 @@ bool CStaticFunctionDefinitions::SetElementHealth(CElement* pElement, float fHea
                 // 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;
+
+                // update dead state for peds
+                if (fHealth > 0 && pPed->IsDead())
+                {
+                    pPed->SetIsDead(false);
+                }
+                // set new health
                 pPed->SetHealth(fHealth);
             }
             else