refactor(es_extended/server/functions): move ESX.GetExtendedVehicleFromPlate logic into vehicle class

This commit is contained in:
Kenshin13
2024-12-20 22:25:38 +01:00
parent 3d16c4fecd
commit 5c44b5c855
2 changed files with 15 additions and 12 deletions
+14 -7
View File
@@ -19,6 +19,7 @@
---@field plate string
---@field isValid fun(self:VehicleClass):boolean
---@field new fun(owner:string, plate:string, coords:vector4): VehicleClass?
---@field getFromPlate fun(plate:string):VehicleClass?
---@field getPlate fun(self:VehicleClass):string?
---@field getNetId fun(self:VehicleClass):number?
---@field getEntity fun(self:VehicleClass):number?
@@ -36,13 +37,9 @@ Core.vehicleClass = {
assert(type(plate) == "string", "Expected 'plate' to be a string")
assert(type(coords) == "vector4", "Expected 'coords' to be a vector4")
if Core.vehicles[plate] then
local obj = table.clone(Core.vehicleClass)
obj.plate = plate
if obj:isValid() then
return obj
end
local xVehicle = Core.vehicleClass.getFromPlate(plate)
if xVehicle then
return xVehicle
end
local dbVehicle = MySQL.single.await("SELECT * FROM `owned_vehicles` WHERE `stored` = true AND `owner` = ? AND `plate` = ?", { owner, plate }) --[[@as DbVehicle]]
@@ -84,6 +81,16 @@ Core.vehicleClass = {
return obj
end,
getFromPlate = function(plate)
if Core.vehicles[plate] then
local obj = table.clone(Core.vehicleClass)
obj.plate = plate
if obj:isValid() then
return obj
end
end
end,
isValid = function(self)
local xVehicle = Core.vehicles[self.plate]
if not xVehicle then
+1 -5
View File
@@ -629,9 +629,5 @@ end
function ESX.GetExtendedVehicleFromPlate(plate)
assert(type(plate) == "string", "Expected 'plate' to be a string")
if Core.vehicles[plate] then
local obj = table.clone(Core.vehicleClass)
obj.plate = plate
return obj
end
return Core.vehicleClass.getFromPlate(plate)
end