refactor: getIsVehicleImmune to getIsVehicleCarjackingImmune

client/functions.lua

@@ -2,12 +2,12 @@ local config = require 'config.client'
 local functions = require 'shared.functions'
 local getIsCloseToCoords = functions.getIsCloseToCoords
 local getIsVehicleAlwaysUnlocked = functions.getIsVehicleAlwaysUnlocked
-local getIsVehicleImmune = functions.getIsVehicleImmune
+local getIsVehicleCarjackingImmune = functions.getIsVehicleCarjackingImmune
 
 local alertSend = false
 local public = {}
 
-public.getIsVehicleImmune = getIsVehicleImmune -- to prevent circular-dependency error
+public.getIsVehicleCarjackingImmune = getIsVehicleCarjackingImmune -- to prevent circular-dependency error
 
 ---Checks if player has vehicle keys
 ---@param plate string The plate number of the vehicle.

client/main.lua

@@ -13,7 +13,7 @@ local isBlacklistedWeapon = functions.isBlacklistedWeapon
 local getIsVehicleAlwaysUnlocked = functions.getIsVehicleAlwaysUnlocked
 local getVehicleByPlate = functions.getVehicleByPlate
 local areKeysJobShared = functions.areKeysJobShared
-local getIsVehicleImmune = functions.getIsVehicleImmune
+local getIsVehicleCarjackingImmune = functions.getIsVehicleCarjackingImmune
 
 -----------------------
 ----   Variables   ----
@@ -313,7 +313,7 @@ local function watchCarjackingAttempts()
                     and not IsPedAPlayer(target)
                 then
                     local targetveh = GetVehiclePedIsIn(target, false)
-                    local isVehicleImmune = getIsVehicleImmune(targetveh)
+                    local isVehicleImmune = getIsVehicleCarjackingImmune(targetveh)
 
                     if not isVehicleImmune
                         and GetPedInVehicleSeat(targetveh, -1) == target
@@ -365,7 +365,7 @@ engineBind = lib.addKeybind({
 RegisterNetEvent('QBCore:Client:VehicleInfo', function(data)
     if not LocalPlayer.state.isLoggedIn and data.event ~= 'Entering' then return end
     if getIsVehicleAlwaysUnlocked(data.vehicle) then return end
-    local isVehicleImmune = getIsVehicleImmune(data.vehicle)
+    local isVehicleImmune = getIsVehicleCarjackingImmune(data.vehicle)
     local driver = GetPedInVehicleSeat(data.vehicle, -1)
     local plate = qbx.getVehiclePlate(data.vehicle)
 

server/main.lua

@@ -56,7 +56,10 @@ end)
 ---Lock every spawned vehicle
 ---@param vehicle number The entity number of the vehicle.
 AddEventHandler('entityCreated', function (vehicle)
-    if not vehicle or GetEntityType(vehicle) ~= 2 or GetEntityPopulationType(vehicle) > 5 then return end
+    if not vehicle
+        or GetEntityType(vehicle) ~= 2
+        or GetEntityPopulationType(vehicle) > 5
+    then return end
     local isDriver = GetPedInVehicleSeat(vehicle, -1) ~= 0
     local isLocked = (config.lockNPCDrivenCars and isDriver) or (config.lockNPCParkedCars and not isDriver)
                         and GetVehicleType(vehicle) ~= 'bike' and not getIsVehicleAlwaysUnlocked(vehicle)

shared/functions.lua

@@ -29,7 +29,7 @@ end
 ---Checking vehicle on the immunes list.
 ---@param vehicle any
 ---@return boolean? `true` if the vehicle is immune, `nil` otherwise.
-function public.getIsVehicleImmune(vehicle)
+function public.getIsVehicleCarjackingImmune(vehicle)
     return getIsVehicleOnList(vehicle, config.immuneVehicles)
 end