Merge pull request #1453 from esx-framework/1.11-hotfix

fix(esx_skin): always use latest Ped Id
esx-framework · Nov 11, 2024 · 5d5f14a · 5d5f14a
2 parents 47a3054 + 7697e14
commit 5d5f14a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/[core]/es_extended/client/modules/actions.lua b/[core]/es_extended/client/modules/actions.lua
@@ -48,7 +48,6 @@ function Actions:TrackPed()
         ESX.SetPlayerData("ped", playerPed)
 
         TriggerEvent("esx:playerPedChanged", playerPed)
-        TriggerServerEvent("esx:playerPedChanged", PedToNet(playerPed))
     end
 end
 

diff --git a/[core]/es_extended/shared/config/main.lua b/[core]/es_extended/shared/config/main.lua
@@ -1,5 +1,6 @@
 Config = {}
 
+-- for ox inventory, use Config.CustomInventory = "ox", for others, set to "resource_name"
 Config.CustomInventory = false
 
 Config.Accounts = {
@@ -53,9 +54,6 @@ Config.AdminLogging = false -- Logs the usage of certain commands by those with
 -- DO NOT CHANGE BELOW THIS LINE UNLESS YOU KNOW WHAT YOU ARE DOING
 --------------------------------------------------------------------
 Config.EnableDefaultInventory = Config.CustomInventory == false -- Display the default Inventory ( F2 )
-if GetResourceState("ox_inventory") ~= "missing" then
-    Config.CustomInventory = "ox"
-end
 
 local txAdminLocale = GetConvar("txAdmin-locale", "en")
 local esxLocale = GetConvar("esx:locale", "invalid")

diff --git a/[core]/esx_skin/client/modules/camera.lua b/[core]/esx_skin/client/modules/camera.lua
@@ -36,7 +36,7 @@ function Camera:PositionLoop()
         while self.cam do
             self:DisableContols()
 
-            local ped = ESX.PlayerData.ped or PlayerPedId()
+            local ped = PlayerPedId()
             local coords = GetEntityCoords(ped)
 
             local pos, posToLook = Skin:CalcuatePosition(coords)
@@ -59,7 +59,7 @@ function Camera:Create()
         return
     end
 
-    local playerPed = ESX.PlayerData.ped or PlayerPedId()
+    local playerPed = PlayerPedId()
     local playerCoords = GetEntityCoords(playerPed)
 
     self.cam = CreateCam("DEFAULT_SCRIPTED_CAMERA", true)

diff --git a/[core]/esx_skin/client/modules/menu.lua b/[core]/esx_skin/client/modules/menu.lua
@@ -36,7 +36,7 @@ function Menu:Restrict()
 end
 
 function Menu:InsertElements()
-    local playerPed = ESX.PlayerData.ped or PlayerPedId()
+    local playerPed = PlayerPedId()
 
     for i = 1, #self.components, 1 do
         local value = self.components[i].value
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,7 +48,6 @@ function Actions:TrackPed() @@
             ESX.SetPlayerData("ped", playerPed)
             TriggerEvent("esx:playerPedChanged", playerPed)
-            TriggerServerEvent("esx:playerPedChanged", PedToNet(playerPed))
         end
     end
@@ Expand Down @@