starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-09-02 11:18:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1080 from MoskalykA/esx-skin-lint

Browse Source 
refactor(esx_skin): correction of lint errors
This commit is contained in:
Gellipapa
2023-06-27 22:23:31 +02:00
committed by GitHub
parent bb2abe014b c4bff589d6
commit 06f492b621
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[core]/esx_skin/client/main.lua
+5 -8
View File
@@ -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)
[core]/esx_skin/server/main.lua
+2 -2
View File
@@ -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')})