fix: compat fixes (#135)

* fix: small fixes

* return boolean

bridge/qb/client.lua

@@ -10,4 +10,14 @@ end)
 
 RegisterNetEvent('vehiclekeys:client:SetOwner', function(plate)
     TriggerServerEvent('qb-vehiclekeys:server:AcquireVehicleKeys', plate)
+end)
+
+CreateQbExport('HasKeys', function(plate)
+    if not plate then return HasKeys(cache.vehicle) end
+    local vehicles = GetVehiclesFromPlate(plate)
+    local success = false
+    for i = 1, #vehicles do
+        success = success or HasKeys(vehicles[i])
+    end
+    return success
 end)

bridge/qb/server.lua

@@ -26,4 +26,13 @@ end)
 
 RegisterNetEvent('qb-vehiclekeys:server:removeKeys', function(plate)
     removeKeys(source, plate)
+end)
+
+CreateQbExport('HasKeys', function(source, plate)
+    local vehicles = GetVehiclesFromPlate(plate)
+    local success = false
+    for i = 1, #vehicles do
+        success = success or HasKeys(source, vehicles[i])
+    end
+    return success
 end)

bridge/qb/shared.lua

@@ -19,13 +19,4 @@ function GetVehiclesFromPlate(plate)
     end
 
     return vehEntityFromPlate
-end
-
-CreateQbExport('HasKeys', function(source, plate)
-    local vehicles = GetVehiclesFromPlate(plate)
-    local success = nil
-    for i = 1, #vehicles do
-        success = success or HasKeys(source, vehicles[i])
-    end
-    return success
-end)
+end

client/functions.lua

@@ -17,11 +17,13 @@ end
 
 ---Checks if player has vehicle keys
 ---@param vehicle number
----@return boolean? `true` if player has vehicle keys, `nil` otherwise.
+---@return boolean `true` if player has vehicle keys, `false` otherwise.
 function HasKeys(vehicle)
+    vehicle = vehicle or cache.vehicle
+    if not vehicle then return false end
     local keysList = LocalPlayer.state.keysList or {}
     local sessionId = Entity(vehicle).state.sessionId
-    return keysList[sessionId]
+    return keysList[sessionId] or false
 end
 
 exports('HasKeys', HasKeys)

client/main.lua

@@ -53,6 +53,16 @@ local function findKeys(vehicleModel, vehicleClass, vehicle)
     local anim = config.anims.lockpick.model[vehicleModel]
         or config.anims.lockpick.model[vehicleClass]
         or config.anims.lockpick.default
+
+    local searchingForKeys = true
+    CreateThread(function()
+        while searchingForKeys do
+            if not IsEntityPlayingAnim(cache.ped, anim.dict, anim.clip, 49) then
+                lib.playAnim(cache.ped, anim.dict, anim.clip, 3.0, 1.0, -1, 49)
+            end
+            Wait(100)
+        end
+    end)
     if lib.progressCircle({
         duration = hotwireTime,
         label = locale('progress.searching_keys'),
@@ -66,13 +76,15 @@ local function findKeys(vehicleModel, vehicleClass, vehicle)
             combat = true,
         }
     }) then
+        searchingForKeys = false
         local success = lib.callback.await('qbx_vehiclekeys:server:findKeys', false, VehToNet(vehicle))
         if not success then
             TriggerServerEvent('hud:server:GainStress', math.random(1, 4))
             exports.qbx_core:Notify(locale("notify.failed_keys"), 'error')
         end
         return success
     end
+    searchingForKeys = false
 end
 
 local isSearchLocked = false

server/keys.lua

@@ -101,13 +101,13 @@ exports('GiveKeys', GiveKeys)
 
 ---@param src number
 ---@param vehicle number
----@return boolean?
+---@return boolean
 function HasKeys(src, vehicle)
     local keysList = Player(src).state.keysList
-    if not keysList then return end
+    if not keysList then return false end
 
     local sessionId = Entity(vehicle).state.sessionId
-    return keysList[sessionId]
+    return keysList[sessionId] or false
 end
 
 exports('HasKeys', HasKeys)