Merge pull request #1480 from Kenshiin13/fix-esx-playerdata

fix(es_extended): eliminate ESX.PlayerData race condition for esx:playerLoaded event
This commit is contained in:
Kenshin13
2024-11-17 22:51:31 +01:00
committed by GitHub
5 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -14,7 +14,7 @@ local function ApplyMetadata(metadata)
end
end
ESX.SecureNetEvent("esx:playerLoaded", function(xPlayer, _, skin)
RegisterNetEvent("esx:playerLoaded", function(xPlayer, _, skin)
ESX.PlayerData = xPlayer
if not Config.Multichar then
+1 -1
View File
@@ -9,7 +9,7 @@ local function checkPhone()
npwd:setPhoneDisabled((phoneItem and phoneItem.count or 0) <= 0)
end
ESX.SecureNetEvent("esx:playerLoaded", checkPhone)
RegisterNetEvent("esx:playerLoaded", checkPhone)
AddEventHandler("onClientResourceStart", function(resource)
if resource ~= "npwd" then
+1 -1
View File
@@ -12,7 +12,7 @@ if not IsDuplicityVersion() then -- Only register this event for the client
end
end)
ESX.SecureNetEvent("esx:playerLoaded", function(xPlayer)
RegisterNetEvent("esx:playerLoaded", function(xPlayer)
ESX.PlayerData = xPlayer
ESX.PlayerLoaded = true
end)
+1 -1
View File
@@ -33,7 +33,7 @@ ESX.SecureNetEvent("esx_multicharacter:SetupUI", function(data, slots)
Multicharacter:SetupUI(data, slots)
end)
ESX.SecureNetEvent('esx:playerLoaded', function(playerData, isNew, skin)
RegisterNetEvent('esx:playerLoaded', function(playerData, isNew, skin)
Multicharacter:PlayerLoaded(playerData, isNew, skin)
end)
+1 -1
View File
@@ -70,7 +70,7 @@ AddEventHandler("esx_skin:playerRegistered", function()
end)
end)
ESX.SecureNetEvent("esx:playerLoaded", function(_, _, skin)
RegisterNetEvent("esx:playerLoaded", function(_, _, skin)
ESX.PlayerLoaded = true
TriggerServerEvent("esx_skin:setWeight", skin)
end)