From 5fd51f5329719caf724ed9a1bfcff63126e2396c Mon Sep 17 00:00:00 2001
From: Andyyy7666 <86536434+Andyyy7666@users.noreply.github.com>
Date: Sat, 22 Jul 2023 21:42:06 +0200
Subject: [PATCH] fix: issues with key item

---
 server/vehicle.lua | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/server/vehicle.lua b/server/vehicle.lua
index 9f77ecb..d6f3b2c 100644
--- a/server/vehicle.lua
+++ b/server/vehicle.lua
@@ -156,6 +156,7 @@ end
 
 function NDCore.spawnOwnedVehicle(source, vehicleID, coords, heading)
     local player = NDCore.getPlayer(source)
+    if not player then return end
     local vehicles = getVehicles(player.id)
     for _, vehicle in pairs(vehicles) do
         if vehicle.id == vehicleID and vehicle.owner == player.id then
@@ -178,13 +179,15 @@ function NDCore.spawnOwnedVehicle(source, vehicleID, coords, heading)
             state.props = vehicle.properties
             state.locked = true
 
-            if Config.useInventoryForKeys then
-                exports.ox_inventory:AddItem(source, "keys", 1, {
-                    vehOwner = vehicle.owner,
-                    vehId = vehicle.id,
-                    vehPlate = vehicle.properties and vehicle.properties.plate,
-                    vehModel = vehicle.properties and vehicle.properties.model
-                })
+            if GetResourceState("ox_inventory") == "started" and Config.useInventoryForKeys then
+                if exports.ox_inventory:GetItem(source, "keys", {vehId = vehicle.id}, true) == 0 then
+                    exports.ox_inventory:AddItem(source, "keys", 1, {
+                        vehOwner = vehicle.owner,
+                        vehId = vehicle.id,
+                        vehPlate = vehicle.properties and vehicle.properties.plate,
+                        vehModel = vehicle.properties and lib.callback.await("ND_Vehicles:getVehicleModelMakeLabel", source, vehicle.properties.model) or ""
+                    })
+                end
             else
                 state.keys = {
                     [player.id] = true
@@ -303,6 +306,7 @@ if Config.useInventoryForKeys then
     end)
     
     RegisterCommand("getkeys", function(source, args, rawCommand)
+        if GetResourceState("ox_inventory") ~= "started" then return end
         local veh = GetVehiclePedIsIn(GetPlayerPed(source))
         if not veh or veh == 0 then return end
 
@@ -316,7 +320,7 @@ if Config.useInventoryForKeys then
             vehOwner = owner,
             vehId = state.id,
             vehPlate = props.plate,
-            vehModel = props.model
+            vehModel = lib.callback.await("ND_Vehicles:getVehicleModelMakeLabel", source, props.model)
         })
     end, false)
 else