Fix invincible peds (#777)

* Fix invincible peds and ArranTuna issue * Remove whitespaces * Small fix, i forgot about this * Update Client/mods/deathmatch/logic/CClientPed.cpp Co-Authored-By: FileEX <alkom@t.pl> * Update Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp Co-Authored-By: FileEX <alkom@t.pl> * Clean up project comments * Change task Co-authored-by: Qais Patankar <qaisjp@gmail.com> Co-authored-by: Patrik Juvonen <patrik@scope.studio>
multitheftauto · Apr 20, 2020 · e43d34f · e43d34f
1 parent a928d80
commit e43d34f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 14 deletions.
diff --git a/Client/mods/deathmatch/logic/CClientPed.cpp b/Client/mods/deathmatch/logic/CClientPed.cpp
@@ -1,9 +1,8 @@
 /*****************************************************************************
  *
- *  PROJECT:     Multi Theft Auto v1.0
- *               (Shared logic for modifications)
+ *  PROJECT:     Multi Theft Auto
  *  LICENSE:     See LICENSE in the top level directory
- *  FILE:        mods/shared_logic/CClientPed.cpp
+ *  FILE:        mods/deathmatch/logic/CClientPed.cpp
  *  PURPOSE:     Ped entity class
  *
  *****************************************************************************/
@@ -1734,8 +1733,17 @@ 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);
+
+            // Recover from dead state to bring the ped back to life
+            m_pTaskManager->RemoveTask(TASK_PRIORITY_EVENT_RESPONSE_NONTEMP);
         }
     }
 }
@@ -1884,16 +1892,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);

diff --git a/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- *  PROJECT:     Multi Theft Auto v1.0
+ *  PROJECT:     Multi Theft Auto
  *  LICENSE:     See LICENSE in the top level directory
  *  FILE:        mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
  *  PURPOSE:     Lua static function definitions class
@@ -1596,6 +1596,14 @@ 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