diff --git a/[core]/esx_skin/client/main.lua b/[core]/esx_skin/client/main.lua index 367e27a6..de5b919f 100644 --- a/[core]/esx_skin/client/main.lua +++ b/[core]/esx_skin/client/main.lua @@ -1,8 +1,8 @@ local lastSkin, cam, isCameraActive -local firstSpawn, zoomOffset, camOffset, heading, skinLoaded = true, 0.0, 0.0, 90.0, false +local firstSpawn, zoomOffset, camOffset, heading = true, 0.0, 0.0, 90.0, false RegisterNetEvent('esx:playerLoaded') -AddEventHandler('esx:playerLoaded', function(xPlayer, isNew, skin) +AddEventHandler('esx:playerLoaded', function(_, _, skin) TriggerServerEvent('esx_skin:setWeight', skin) end) @@ -117,7 +117,7 @@ function OpenMenu(submitCb, cancelCb, restrict) menu.refresh() end - end, function(data, menu) + end, function() DeleteSkinCam() end) end) @@ -248,7 +248,6 @@ end AddEventHandler('esx_skin:resetFirstSpawn', function() firstSpawn = true - skinLoaded = false ESX.PlayerLoaded = false end) @@ -259,15 +258,13 @@ AddEventHandler('esx_skin:playerRegistered', function() end if firstSpawn then - ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin) + ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin) if skin == nil then TriggerEvent('skinchanger:loadSkin', {sex = 0}, OpenSaveableMenu) Wait(100) - skinLoaded = true else TriggerEvent('skinchanger:loadSkin', skin) Wait(100) - skinLoaded = true end end) @@ -277,7 +274,7 @@ AddEventHandler('esx_skin:playerRegistered', function() end) RegisterNetEvent('esx:playerLoaded') -AddEventHandler('esx:playerLoaded', function(xPlayer) +AddEventHandler('esx:playerLoaded', function() ESX.PlayerLoaded = true end) diff --git a/[core]/esx_skin/server/main.lua b/[core]/esx_skin/server/main.lua index 73f47cd0..29d3da28 100644 --- a/[core]/esx_skin/server/main.lua +++ b/[core]/esx_skin/server/main.lua @@ -71,10 +71,10 @@ ESX.RegisterServerCallback('esx_skin:getPlayerSkin', function(source, cb) end) end) -ESX.RegisterCommand('skin', 'admin', function(xPlayer, args, showError) +ESX.RegisterCommand('skin', 'admin', function(xPlayer) xPlayer.triggerEvent('esx_skin:openSaveableMenu') end, false, {help = TranslateCap('skin')}) -ESX.RegisterCommand('skinsave', 'admin', function(xPlayer, args, showError) +ESX.RegisterCommand('skinsave', 'admin', function(xPlayer) xPlayer.triggerEvent('esx_skin:requestSaveSkin') end, false, {help = TranslateCap('saveskin')})