From 75216f538e484dd6614d3ac8698ed3e2d3c302ae Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Sun, 16 Feb 2025 09:29:27 -0500 Subject: [PATCH] start keys serverside --- .../vehicleKey/MrNewbVehicleKeys/client/client.lua | 2 +- .../vehicleKey/MrNewbVehicleKeys/server/server.lua | 14 ++++++++++++-- .../vehicleKey/qb-vehiclekeys/client/client.lua | 5 ++++- .../vehicleKey/qb-vehiclekeys/server/server.lua | 8 ++++++-- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/modules/vehicleKey/MrNewbVehicleKeys/client/client.lua b/modules/vehicleKey/MrNewbVehicleKeys/client/client.lua index 7b17541..31230ac 100644 --- a/modules/vehicleKey/MrNewbVehicleKeys/client/client.lua +++ b/modules/vehicleKey/MrNewbVehicleKeys/client/client.lua @@ -2,7 +2,7 @@ if GetResourceState('MrNewbVehicleKeys') ~= 'started' then return end VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) - if not DoesEntityExist(vehicle) then return false end + if not DoesEntityExist(vehicle) and not plate then return false end return exports.MrNewbVehicleKeys:GiveKeys(vehicle) end diff --git a/modules/vehicleKey/MrNewbVehicleKeys/server/server.lua b/modules/vehicleKey/MrNewbVehicleKeys/server/server.lua index f8d74ae..32f50ba 100644 --- a/modules/vehicleKey/MrNewbVehicleKeys/server/server.lua +++ b/modules/vehicleKey/MrNewbVehicleKeys/server/server.lua @@ -2,9 +2,19 @@ if GetResourceState('MrNewbVehicleKeys') ~= 'started' then return end VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(src, vehicle, plate) - --wip + if vehicle then + local netId = NetworkGetNetworkIdFromEntity(vehicle) + return exports.MrNewbVehicleKeys:GiveKeys(src, netId) + elseif plate then + return exports.MrNewbVehicleKeys:GiveKeysByPlate(src, plate) + end end VehicleKey.RemoveKeys = function(src, vehicle, plate) - -- wip + if vehicle then + local netId = NetworkGetNetworkIdFromEntity(vehicle) + return exports.MrNewbVehicleKeys:RemoveKeys(src, netId) + elseif plate then + return exports.MrNewbVehicleKeys:RemoveKeysByPlate(src, plate) + end end \ No newline at end of file diff --git a/modules/vehicleKey/qb-vehiclekeys/client/client.lua b/modules/vehicleKey/qb-vehiclekeys/client/client.lua index fda29d8..e27b7f2 100644 --- a/modules/vehicleKey/qb-vehiclekeys/client/client.lua +++ b/modules/vehicleKey/qb-vehiclekeys/client/client.lua @@ -3,9 +3,12 @@ if GetResourceState('qbx_vehiclekeys') == 'started' then return end VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) + if plate == nil and vehicle and DoesEntityExist(vehicle) then + plate = GetVehicleNumberPlateText(vehicle) + end TriggerServerEvent('qb-vehiclekeys:server:AcquireVehicleKeys', plate) end VehicleKey.RemoveKeys = function(vehicle, plate) - return true + TriggerEvent('qb-vehiclekeys:client:RemoveKeys', plate) end \ No newline at end of file diff --git a/modules/vehicleKey/qb-vehiclekeys/server/server.lua b/modules/vehicleKey/qb-vehiclekeys/server/server.lua index 6f07ac6..4709d37 100644 --- a/modules/vehicleKey/qb-vehiclekeys/server/server.lua +++ b/modules/vehicleKey/qb-vehiclekeys/server/server.lua @@ -3,9 +3,13 @@ if GetResourceState('qbx_vehiclekeys') == 'started' then return end VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(src, vehicle, plate) - --wip + if plate then + return exports["qb-vehiclekeys"]:GiveKeys(src, plate) + end end VehicleKey.RemoveKeys = function(src, vehicle, plate) - -- wip + if plate then + return exports["qb-vehiclekeys"]:RemoveKeys(src, plate) + end end \ No newline at end of file