Revert changes from pull request #3930

Author: botder

Client/game_sa/CFireSA.cpp

@@ -14,8 +14,6 @@
 #include "CFireSA.h"
 #include "CGameSA.h"
 #include "CPoolsSA.h"
-#include <game/CTaskManager.h>
-#include <game/TaskTypes.h>
 
 extern CGameSA* pGame;
 
@@ -211,49 +209,3 @@ void CFireSA::SetNumGenerationsAllowed(char generations)
 {
     internalInterface->nNumGenerationsAllowed = generations;
 }
-
-////////////////////////////////////////////////////////////////////////
-// CFire::Extinguish
-//
-// Fix GH #3249 (PLAYER_ON_FIRE task is not aborted after the fire is extinguished)
-////////////////////////////////////////////////////////////////////////
-static void AbortFireTask(CEntitySAInterface* entityOnFire, DWORD returnAddress)
-{
-    // We can't and shouldn't remove the task if we're in CTaskSimplePlayerOnFire::ProcessPed. Otherwise we will crash.
-    if (returnAddress == 0x633783)
-        return;
-
-    auto ped = pGame->GetPools()->GetPed(reinterpret_cast<DWORD*>(entityOnFire));
-    if (!ped || !ped->pEntity)
-        return;
-
-    CTaskManager* taskManager = ped->pEntity->GetPedIntelligence()->GetTaskManager();
-    if (!taskManager)
-        return;
-
-    taskManager->RemoveTaskSecondary(TASK_SECONDARY_PARTIAL_ANIM, TASK_SIMPLE_PLAYER_ON_FIRE);
-}
-
-#define HOOKPOS_CFire_Extinguish 0x539429
-#define HOOKSIZE_CFire_Extinguish 6
-static constexpr std::uintptr_t CONTINUE_CFire_Extinguish = 0x53942F;
-static void _declspec(naked) HOOK_CFire_Extinguish()
-{
-    _asm
-    {
-        mov [eax+730h], edi
-        mov ebx, [esp+8]
-
-        push ebx
-        push eax
-        call AbortFireTask
-        add esp, 8
-
-        jmp CONTINUE_CFire_Extinguish
-    }
-}
-
-void CFireSA::StaticSetHooks()
-{
-    EZHookInstall(CFire_Extinguish);
-}

Client/game_sa/CFireSA.h

@@ -64,6 +64,4 @@ class CFireSA : public CFire
     void              SetStrength(float fStrength);
     void              SetNumGenerationsAllowed(char generations);
     CFireSAInterface* GetInterface() { return internalInterface; }
-
-    static void StaticSetHooks();
 };

Client/game_sa/CGameSA.cpp

@@ -246,7 +246,6 @@ CGameSA::CGameSA()
         CVehicleSA::StaticSetHooks();
         CCheckpointSA::StaticSetHooks();
         CHudSA::StaticSetHooks();
-        CFireSA::StaticSetHooks();
         CPtrNodeSingleLinkPoolSA::StaticSetHooks();
     }
     catch (const std::bad_alloc& e)

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -2558,7 +2558,7 @@ bool CStaticFunctionDefinitions::SetPedAimTarget(CClientEntity& Entity, CVector&
 bool CStaticFunctionDefinitions::SetPedStat(CClientEntity& Entity, ushort usStat, float fValue)
 {
     RUN_CHILDREN(SetPedStat(**iter, usStat, fValue))
-    if (IS_PED(&Entity) && Entity.IsLocalEntity())
+    if (IS_PED(&Entity))
     {
         CClientPed& Ped = static_cast<CClientPed&>(Entity);
         // Dont let them set visual stats if they don't have the CJ model

Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp

@@ -2520,7 +2520,7 @@ bool CLuaElementDefs::SetLowLodElement(lua_State* luaVM, CClientEntity* pEntity,
 
 bool CLuaElementDefs::SetElementOnFire(CClientEntity* entity, bool onFire) noexcept
 {
-    if (!entity->IsLocalEntity() && entity != CStaticFunctionDefinitions::GetLocalPlayer())
+    if (!entity->IsLocalEntity())
         return false;
 
     return entity->SetOnFire(onFire);