mirror of
https://github.com/esx-framework/esx_core.git
synced 2026-08-29 01:08:54 +00:00
chore(esx_core): add 2 pull request changes
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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)
|
||||
@@ -80,7 +80,7 @@ RegisterNetEvent("esx_skin:openMenu", function(submitCb, cancelCb)
|
||||
end)
|
||||
|
||||
RegisterNetEvent("esx_skin:openRestrictedMenu", function(submitCb, cancelCb, restrict)
|
||||
Menu:Open(submitCb, cancelCb, nil)
|
||||
Menu:Open(submitCb, cancelCb, restrict)
|
||||
end)
|
||||
|
||||
RegisterNetEvent("esx_skin:openSaveableMenu", function(submitCb, cancelCb)
|
||||
|
||||
Reference in New Issue
Block a user