fix: linting issues

This commit is contained in:
Kasey FItton
2024-11-09 03:26:04 +00:00
parent 6f1d2a369e
commit 5cd3a0348a
5 changed files with 20 additions and 10 deletions
+1 -1
View File
@@ -139,7 +139,7 @@ AddStateBagChangeHandler("VehicleProperties", nil, function(bagName, _, value)
end
end
if not NetworkGetEntityOwner(vehicle) == ESX.playerId then
if NetworkGetEntityOwner(vehicle) ~= ESX.playerId then
return
end
+4 -4
View File
@@ -926,11 +926,11 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
self.triggerEvent('esx:updatePlayerData', 'metadata', self.metadata)
end
for _, funcs in pairs(Core.PlayerFunctionOverrides) do
for fnName, fn in pairs(funcs) do
for _, funcs in pairs(Core.PlayerFunctionOverrides) do
for fnName, fn in pairs(funcs) do
self[fnName] = fn(self)
end
end
end
end
return self
end
+1 -1
View File
@@ -10,7 +10,7 @@ dependencies { 'es_extended', 'esx_context', 'esx_identity', 'esx_skin' }
shared_scripts { '@es_extended/imports.lua', '@es_extended/locale.lua', 'locales/*.lua', 'config.lua' }
server_scripts {
server_scripts {
'@oxmysql/lib/MySQL.lua',
'server/*.lua',
'server/modules/*.lua'
+2 -1
View File
@@ -32,6 +32,7 @@ function Menu:Restrict()
_components[#_components + 1] = self.components[i]
end
end
return _components
end
function Menu:InsertElements()
@@ -141,4 +142,4 @@ function Menu:Saveable(submitCb, cancelCb, restrict)
submitCb(data, menu)
end
end, cancelCb, restrict)
end
end
+12 -3
View File
@@ -95,7 +95,16 @@ function SkinChanger:LoadSkin(skin, cb)
end
function SkinChanger:ValidClothes(key)
local keys = {["sex"] = true, ["mom"] = true, ["dad"] = true, ["face_md_weight"] = true, ["skin_md_weight"] = true, ["nose_1"] = true, ["nose_2"] = true, ["nose_3"] = true, ["nose_4"] = true, ["nose_5"] = true, ["nose_6"] = true, ["cheeks_1"] = true, ["cheeks_2"] = true, ["cheeks_3"] = true, ["lip_thickness"] = true, ["jaw_1"] = true, ["jaw_2"] = true, ["chin_1"] = true, ["chin_2"] = true, ["chin_3"] = true, ["chin_4"] = true, ["neck_thickness"] = true, ["age_1"] = true, ["age_2"] = true, ["eye_color"] = true, ["eye_squint"] = true, ["beard_1"] = true, ["beard_2"] = true, ["beard_3"] = true, ["beard_4"] = true, ["hair_1"] = true, ["hair_2"] = true, ["hair_color_1"] = true, ["hair_color_2"] = true, ["eyebrows_1"] = true, ["eyebrows_2"] = true, ["eyebrows_3"] = true, ["eyebrows_4"] = true, ["eyebrows_5"] = true, ["eyebrows_6"] = true, ["makeup_1"] = true, ["makeup_2"] = true, ["makeup_3"] = true, ["makeup_4"] = true, ["lipstick_1"] = true, ["lipstick_2"] = true, ["lipstick_3"] = true, ["lipstick_4"] = true, ["blemishes_1"] = true, ["blemishes_2"] = true, ["blemishes_3"] = true, ["blush_1"] = true, ["blush_2"] = true, ["blush_3"] = true, ["complexion_1"] = true, ["complexion_2"] = true, ["sun_1"] = true, ["sun_2"] = true, ["moles_1"] = true, ["moles_2"] = true, ["chest_1"] = true, ["chest_2"] = true, ["chest_3"] = true, ["bodyb_1"] = true, ["bodyb_2"] = true, ["bodyb_3"] = true, ["bodyb_4"] = true}
local keys = {["sex"] = true, ["mom"] = true, ["dad"] = true, ["face_md_weight"] = true, ["skin_md_weight"] = true, ["nose_1"] = true, ["nose_2"] = true,
["nose_3"] = true, ["nose_4"] = true, ["nose_5"] = true, ["nose_6"] = true, ["cheeks_1"] = true, ["cheeks_2"] = true, ["cheeks_3"] = true,
["lip_thickness"] = true, ["jaw_1"] = true, ["jaw_2"] = true, ["chin_1"] = true, ["chin_2"] = true, ["chin_3"] = true, ["chin_4"] = true,
["neck_thickness"] = true, ["age_1"] = true, ["age_2"] = true, ["eye_color"] = true, ["eye_squint"] = true, ["beard_1"] = true, ["beard_2"] = true,
["beard_3"] = true, ["beard_4"] = true, ["hair_1"] = true, ["hair_2"] = true, ["hair_color_1"] = true, ["hair_color_2"] = true, ["eyebrows_1"] = true,
["eyebrows_2"] = true, ["eyebrows_3"] = true, ["eyebrows_4"] = true, ["eyebrows_5"] = true, ["eyebrows_6"] = true, ["makeup_1"] = true, ["makeup_2"] = true,
["makeup_3"] = true, ["makeup_4"] = true, ["lipstick_1"] = true, ["lipstick_2"] = true, ["lipstick_3"] = true, ["lipstick_4"] = true, ["blemishes_1"] = true,
["blemishes_2"] = true, ["blemishes_3"] = true, ["blush_1"] = true, ["blush_2"] = true, ["blush_3"] = true, ["complexion_1"] = true, ["complexion_2"] = true,
["sun_1"] = true, ["sun_2"] = true, ["moles_1"] = true, ["moles_2"] = true, ["chest_1"] = true, ["chest_2"] = true, ["chest_3"] = true, ["bodyb_1"] = true,
["bodyb_2"] = true, ["bodyb_3"] = true, ["bodyb_4"] = true}
return keys[key] ~= nil
end
@@ -116,7 +125,7 @@ function SkinChanger:SetHead()
if not self.character["grandparents"] then
self.character["grandparents"] = 0
end
SetPedHeadBlendData(self.playerPed,
self.character["mom"], self.character["dad"], self.character["grandparents"] , self.character["mom"],
self.character["dad"], self.character["grandparents"], face_weight, skin_weight, third_weight, false)
@@ -312,4 +321,4 @@ AddEventHandler("skinchanger:getData", function(cb)
cb(SkinChanger:GetData())
end)
SkinChanger:Init()
SkinChanger:Init()