feat(server): full vehicle persistence

client/vehicle-persistence.lua

@@ -1,5 +1,6 @@
 if GetConvar('qbx:enableVehiclePersistence', 'false') == 'false' then return end
 
+local zones
 local cachedProps
 local netId
 local vehicle
@@ -71,4 +72,25 @@ lib.onCache('seat', function(newSeat)
         vehicle = nil
         netId = nil
     end
+end)
+
+AddEventHandler('QBCore:Client:OnPlayerLoaded', function()
+    local vehicles = lib.callback.await('qbx_core:server:getVehiclesToSpawn', 2500)
+    for i = 1, #vehicles do
+        local data = vehicles[i]
+        zones[data.id] = lib.points.new({
+            distance = 75.0,
+            coords = data.coords,
+            onEnter = function()
+                TriggerServerEvent('qbx_core:server:spawnVehicle', data.id, data.coords)
+            end
+        })
+    end
+end)
+
+RegisterNetEvent('qbx_core:client:removeVehZone', function(id)
+    if zones[id] then
+        zones[id]:remove()
+        zones[id] = nil
+    end
 end)

server/vehicle-persistence.lua

@@ -1,3 +1,6 @@
+local persistence = GetConvarInt('qbx:enableVehiclePersistence', 0)
+print('Vehicle persistence mode ' .. persistence)
+
 ---A persisted vehicle will respawn when deleted. Only works for player owned vehicles.
 ---Vehicles spawned using lib are automatically persisted
 ---@param vehicle number
@@ -15,7 +18,7 @@ end
 
 exports('DisablePersistence', DisablePersistence)
 
-if GetConvar('qbx:enableVehiclePersistence', 'false') == 'false' then return end
+if persistence == 0 then return end
 
 assert(lib.checkDependency('qbx_vehicles', '1.4.1', true))
 
@@ -29,6 +32,7 @@ RegisterNetEvent('qbx_core:server:vehiclePropsChanged', function(netId, diff)
     local vehicleId = getVehicleId(vehicle)
     if not vehicleId then return end
 
+    local coords = nil
     local props = exports.qbx_vehicles:GetPlayerVehicle(vehicleId)?.props
     if not props then return end
 
@@ -68,8 +72,15 @@ RegisterNetEvent('qbx_core:server:vehiclePropsChanged', function(netId, diff)
         props.tyres = diff.tyres ~= 'deleted' and diff.tyres or nil
     end
 
+    if persistence == 2 then
+        local entityCoords = GetEntityCoords(vehicle)
+        local entityHeading = GetEntityHeading(vehicle)
+        coords = vec4(entityCoords.x, entityCoords.y, entityCoords.z, entityHeading)
+    end
+
     exports.qbx_vehicles:SaveVehicle(vehicle, {
         props = props,
+        coords = coords
     })
 end)
 
@@ -121,4 +132,50 @@ AddEventHandler('entityRemoved', function(entity)
         local passenger = passengers[i]
         SetPedIntoVehicle(passenger.ped, veh, passenger.seat)
     end
+end)
+
+if persistence == 1 then return end
+
+local function checkVehicleExist(plate)
+    local vehicles = GetGamePool('CVehicle')
+    for i = 1, #vehicles do
+        local vehicle = vehicles[i]
+        if qbx.getVehiclePlate(vehicle) == plate then
+            return true
+        end
+    end
+end
+
+local function spawnVehicle(coords, id, model, props)
+    local _, veh = qbx.spawnVehicle({
+        spawnSource = vector4(coords.x, coords.y, coords.z, coords.w),
+        model = model,
+        props = props
+    })
+    exports.qbx_core:EnablePersistence(veh)
+    Entity(veh).state:set('vehicleid', id, false)
+    SetVehicleDoorsLocked(veh, 2)
+    TriggerClientEvent('qbx_core:client:removeVehZone', -1, id)
+end
+
+lib.callback.register('qbx_core:server:getVehiclesToSpawn', function()
+    local vehicles = {}
+    local query = 'SELECT id, plate, coords FROM player_vehicles WHERE state = 0'
+    local results = MySQL.query.await(query)
+    for _, data in pairs(results) do
+        local coords = json.decode(data.coords)
+        if coords and not checkVehicleExist(data.plate) then
+            vehicles[#vehicles + 1] = {
+                id = data.id,
+                coords = coords,
+            }
+        end
+    end
+    return vehicles
+end)
+
+RegisterNetEvent('qbx_core:server:spawnVehicle', function(id, coords)
+    local vehicle = exports.qbx_vehicles:GetPlayerVehicle(id)
+    if not vehicle then return end
+    spawnVehicle(coords, id, vehicle.modelName, vehicle.props)
 end)