Merge remote-tracking branch 'upstream/main'

client/main.lua

@@ -279,8 +279,6 @@ local function useClosestDoor()
 	end
 end
 
-exports('useClosestDoor', useClosestDoor)
-
 CreateThread(function()
 	local lockDoor = locale('lock_door')
 	local unlockDoor = locale('unlock_door')
@@ -357,3 +355,6 @@ RegisterNUICallback('loadLocale', function(_, cb)
         data = json.decode(JSON)
     })
 end)
+
+exports('useClosestDoor', useClosestDoor)
+exports('getClosestDoor', function() return ClosestDoor end)

client/utils.lua

@@ -266,11 +266,6 @@ CreateThread(function()
 			ox = true,
 			exp = exports.ox_target
 		}
-	elseif GetResourceState('qb-target'):find('start') then
-		target = {
-			qb = true,
-			exp = exports['qb-target']
-		}
 	elseif GetResourceState('qtarget'):find('start') then
 		target = {
 			qt = true,
@@ -309,8 +304,6 @@ CreateThread(function()
 
 		if target.qt then
 			target.exp:Object({ options = options })
-		elseif target.qb then
-			target.exp:AddGlobalObject({ options = options })
 		end
 
 		options = { locale('pick_lock') }
@@ -320,10 +313,6 @@ CreateThread(function()
 				if target.qt then
 					return target.exp:RemoveObject(options)
 				end
-
-				if target.qb then
-					return target.exp:RemoveGlobalObject(options)
-				end
 			end
 		end)
 	end

fxmanifest.lua

@@ -6,7 +6,7 @@ game         'gta5'
 
 --[[ Resource Information ]]--
 name         'ox_doorlock'
-version      '1.17.0'
+version      '1.18.0'
 license      'GPL-3.0-or-later'
 author       'Overextended'
 repository   'https://github.com/overextended/ox_doorlock'

server/framework/qbx_core.lua

@@ -0,0 +1,14 @@
+local QBX = exports.qbx_core
+
+function GetPlayer(playerId)
+    local player = { source = playerId }
+    return player
+end
+
+function GetCharacterId(player)
+	return QBX:GetPlayer(player.source).PlayerData.citizenid
+end
+
+function IsPlayerInGroup(player, filter)
+    return QBX:HasGroup(player.source, filter)
+end

server/utils.lua

@@ -24,7 +24,7 @@ function utils.getFilesInDirectory(path, pattern)
 	return files, fileCount
 end
 
-local frameworks = { 'es_extended', 'ND_Core', 'ox_core', 'qb-core' }
+local frameworks = { 'es_extended', 'ND_Core', 'ox_core', 'qbx_core' }
 local sucess = false
 
 for i = 1, #frameworks do