fix: allow vehicle to be locked/unlocked only if it has a lock

Qbox-project · Sep 23, 2024 · fdd6ecb · fdd6ecb
1 parent a1f020f
commit fdd6ecb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/client/main.lua b/client/main.lua
@@ -418,9 +418,6 @@ end
 
 qbx.entityStateHandler('doorslockstate', function(entity, _, value)
     if entity == 0 then return end
-    if getIsVehicleShared(entity) then
-        value = 1
-    end
     SetVehicleDoorsLocked(entity, value)
 end)
 

diff --git a/server/main.lua b/server/main.lua
@@ -6,6 +6,7 @@ local addPlayer = functions.addPlayer
 local removePlayer = functions.removePlayer
 local getIsVehicleAlwaysUnlocked = sharedFunctions.getIsVehicleAlwaysUnlocked
 local getIsVehicleInitiallyLocked = sharedFunctions.getIsVehicleInitiallyLocked
+local getIsVehicleShared = sharedFunctions.getIsVehicleShared
 
 ---@enum EntityType
 local EntityType = {
@@ -39,6 +40,7 @@ end)
 RegisterNetEvent('qb-vehiclekeys:server:setVehLockState', function(vehNetId, state)
 	local vehicleEntity = NetworkGetEntityFromNetworkId(vehNetId)
 	if type(state) ~= 'number' or not DoesEntityExist(vehicleEntity) then return end
+    if getIsVehicleAlwaysUnlocked(vehicleEntity) or getIsVehicleShared(vehicleEntity) then return end
     Entity(vehicleEntity).state:set('doorslockstate', state, true)
 end)