From 3a3c3f1ed1c5fe66fa9aa2b4e856f58aaf07971d Mon Sep 17 00:00:00 2001
From: Kenshin13 <63159154+Kenshiin13@users.noreply.github.com>
Date: Mon, 23 Dec 2024 00:07:22 +0100
Subject: [PATCH 1/4] fix(es_extended/imports): wait for ped to be set before
 setting PlayerLoaded

---
 [core]/es_extended/imports.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/[core]/es_extended/imports.lua b/[core]/es_extended/imports.lua
index d6eb1449..2727995d 100644
--- a/[core]/es_extended/imports.lua
+++ b/[core]/es_extended/imports.lua
@@ -14,6 +14,7 @@ if not IsDuplicityVersion() then -- Only register this event for the client
 
     RegisterNetEvent("esx:playerLoaded", function(xPlayer)
         ESX.PlayerData = xPlayer
+        while not ESX.PlayerData.ped or not DoesEntityExist(ESX.PlayerData.ped) do Wait(0) end
         ESX.PlayerLoaded = true
     end)
 

From 831e4097f7c5ee8eb4ca78dbf0a498b66f8ad4a5 Mon Sep 17 00:00:00 2001
From: Kenshin13 <63159154+Kenshiin13@users.noreply.github.com>
Date: Mon, 23 Dec 2024 16:37:15 +0100
Subject: [PATCH 2/4] fix(es_extended/client/modules/actions): fix ped change
 not propogating

---
 [core]/es_extended/client/modules/actions.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/[core]/es_extended/client/modules/actions.lua b/[core]/es_extended/client/modules/actions.lua
index 0ff99ff9..028ded07 100644
--- a/[core]/es_extended/client/modules/actions.lua
+++ b/[core]/es_extended/client/modules/actions.lua
@@ -45,8 +45,8 @@ function Actions:TrackPed()
     local newPed = PlayerPedId()
 
     if playerPed ~= newPed then
-        ESX.PlayerData.ped = newPed
         ESX.SetPlayerData("ped", newPed)
+        ESX.PlayerData.ped = newPed
 
         TriggerEvent("esx:playerPedChanged", newPed)
 

From 553303fd282f117076f44d45c6254b7b5aef22a2 Mon Sep 17 00:00:00 2001
From: Kenshin13 <63159154+Kenshiin13@users.noreply.github.com>
Date: Mon, 23 Dec 2024 16:39:48 +0100
Subject: [PATCH 3/4] fix(es_extended/client/modules/death): fix death module
 trying to access invalid ped

---
 [core]/es_extended/client/modules/death.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/[core]/es_extended/client/modules/death.lua b/[core]/es_extended/client/modules/death.lua
index ab75719c..ba3fb846 100644
--- a/[core]/es_extended/client/modules/death.lua
+++ b/[core]/es_extended/client/modules/death.lua
@@ -63,7 +63,7 @@ end
 AddEventHandler("esx:onPlayerSpawn", function()
     Citizen.CreateThreadNow(function()
         while ESX.PlayerLoaded and not ESX.PlayerData.dead do
-            if IsPedDeadOrDying(ESX.PlayerData.ped, true) or IsPedFatallyInjured(ESX.PlayerData.ped) then
+            if DoesEntityExist(ESX.PlayerData.ped) and (IsPedDeadOrDying(ESX.PlayerData.ped, true) or IsPedFatallyInjured(ESX.PlayerData.ped)) then
                 Death:Died()
                 break
             end

From cb153c2fecd40d57e2ab6ffb89a5a558c35ee225 Mon Sep 17 00:00:00 2001
From: Kenshin13 <63159154+Kenshiin13@users.noreply.github.com>
Date: Mon, 23 Dec 2024 16:52:23 +0100
Subject: [PATCH 4/4] fix(es_extended/client/modules/actions): avoid manually
 setting playerdata entirely

---
 [core]/es_extended/client/modules/actions.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/[core]/es_extended/client/modules/actions.lua b/[core]/es_extended/client/modules/actions.lua
index 028ded07..98b864b1 100644
--- a/[core]/es_extended/client/modules/actions.lua
+++ b/[core]/es_extended/client/modules/actions.lua
@@ -46,7 +46,6 @@ function Actions:TrackPed()
 
     if playerPed ~= newPed then
         ESX.SetPlayerData("ped", newPed)
-        ESX.PlayerData.ped = newPed
 
         TriggerEvent("esx:playerPedChanged", newPed)