From ba6886b4a88544a2e72ec9ecd9ba5d8cb071f79a Mon Sep 17 00:00:00 2001 From: Mustache Dom <123716453+Mustachedom@users.noreply.github.com> Date: Sun, 25 Jan 2026 03:21:15 -0700 Subject: [PATCH 1/8] - `fix` - `issue` - function getInventoryNewVersion() does not have a return if you are 2.0 or higher. resulting in auto setting to false - `how i fixed` - added a return --- modules/inventory/qb-inventory/server.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/inventory/qb-inventory/server.lua b/modules/inventory/qb-inventory/server.lua index 8086949..e0ace95 100644 --- a/modules/inventory/qb-inventory/server.lua +++ b/modules/inventory/qb-inventory/server.lua @@ -12,7 +12,10 @@ Inventory.Version = nil Inventory.ShopData = {} local function getInventoryNewVersion() - if tonumber(string.sub(GetResourceMetadata("qb-inventory", "version", 0), 1, 1)) >= 2 then Inventory.Version = true end + if tonumber(string.sub(GetResourceMetadata("qb-inventory", "version", 0), 1, 1)) >= 2 then + Inventory.Version = true + return + end Inventory.Version = false end From f753b8ae974d7060ca7b34bd2723efda7de29374 Mon Sep 17 00:00:00 2001 From: Sinaps Dev Date: Wed, 28 Jan 2026 23:49:08 +0100 Subject: [PATCH 2/8] fixed qbcore GetIsFrameworkAdmin method --- modules/framework/qb-core/server.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/framework/qb-core/server.lua b/modules/framework/qb-core/server.lua index 0908af9..3b9c92a 100644 --- a/modules/framework/qb-core/server.lua +++ b/modules/framework/qb-core/server.lua @@ -26,7 +26,10 @@ end ---@return boolean Framework.GetIsFrameworkAdmin = function(src) if not src then return false end - return QBCore.Functions.HasPermission(src, 'admin') + local isAdmin = QBCore.Functions.HasPermission(src, 'admin') + local isGod = QBCore.Functions.HasPermission(src, 'god') + local isAceAllowed = IsPlayerAceAllowed(src, 'command') + return isAdmin or isGod or isAceAllowed end ---@description This will return the citizen ID of the player. From bd531c84648124c212ce3f117afd177513f39b00 Mon Sep 17 00:00:00 2001 From: Sinaps Dev Date: Sat, 31 Jan 2026 19:18:58 +0100 Subject: [PATCH 3/8] decreased marker thread interaval 2ms to remove flickering --- lib/markers/client/markers.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/markers/client/markers.lua b/lib/markers/client/markers.lua index a747e20..9d0d3c0 100644 --- a/lib/markers/client/markers.lua +++ b/lib/markers/client/markers.lua @@ -114,7 +114,7 @@ function Marker.Run() ) ::continue:: end - Wait(3) + Wait(2) end end) end From bf98a386198beb560c66c002d9f8cd061d0a706c Mon Sep 17 00:00:00 2001 From: Mustache Dom <123716453+Mustachedom@users.noreply.github.com> Date: Sun, 8 Feb 2026 02:10:14 -0700 Subject: [PATCH 4/8] - `add` Framework Functions - added `GetPlayerByIdentifier` - added `GetPlayerSource` --- modules/framework/es_extended/server.lua | 19 +++++++++++++++++++ modules/framework/qb-core/server.lua | 19 +++++++++++++++++++ modules/framework/qbx_core/server.lua | 19 +++++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/modules/framework/es_extended/server.lua b/modules/framework/es_extended/server.lua index 4d37030..41b37b8 100644 --- a/modules/framework/es_extended/server.lua +++ b/modules/framework/es_extended/server.lua @@ -78,6 +78,25 @@ Framework.GetPlayer = function(src) return xPlayer end +---@description Returns the player data of the specified identifier in the framework defualt format. +---@param citizenid string +---@return table | nil +Framework.GetPlayerByIdentifier = function(citizenid) + local player = ESX.GetPlayerFromIdentifier(citizenid) + if not player then return end + return player +end + +---@description This will return the player source of the specified citizen ID. +---@param citizenid string +---@return number | nil +Framework.GetPlayerSource = function(citizenid) + local player = Framework.GetPlayerByIdentifier(citizenid) + if not player then return end + return player.source +end + + --- @description Returns the citizen ID of the player. --- @param src number --- @return string | nil returns the citizen ID of the player if it exists diff --git a/modules/framework/qb-core/server.lua b/modules/framework/qb-core/server.lua index 0908af9..e8306a0 100644 --- a/modules/framework/qb-core/server.lua +++ b/modules/framework/qb-core/server.lua @@ -48,6 +48,25 @@ Framework.GetPlayer = function(src) return player end + +---@description Returns the player data of the specified identifier in the framework defualt format. +---@param citizenid string +---@return table | nil +Framework.GetPlayerByIdentifier = function(citizenid) + local player = QBCore.Functions.GetPlayerByCitizenId(citizenid) + if not player then return end + return player +end + +---@description This will return the player source of the specified citizen ID. +---@param citizenid string +---@return number | nil +Framework.GetPlayerSource = function(citizenid) + local player = Framework.GetPlayerByIdentifier(citizenid) + if not player then return end + return player.PlayerData.source +end + ---@description This will return the jobs registered in the framework in a table. ---@return table {name = jobName, label = jobLabel, grade = {name = gradeName, level = gradeLevel}} Framework.GetFrameworkJobs = function() diff --git a/modules/framework/qbx_core/server.lua b/modules/framework/qbx_core/server.lua index 98b086c..f8431aa 100644 --- a/modules/framework/qbx_core/server.lua +++ b/modules/framework/qbx_core/server.lua @@ -44,6 +44,25 @@ Framework.GetPlayer = function(src) return player end + +---@description Returns the player data of the specified identifier in the framework defualt format. +---@param citizenid string +---@return table | nil +Framework.GetPlayerByIdentifier = function(citizenid) + local player = QBox:GetPlayerByCitizenId(citizenid) + if not player then return end + return player +end + +---@description This will return the player source of the specified citizen ID. +---@param citizenid string +---@return number | nil +Framework.GetPlayerSource = function(citizenid) + local player = Framework.GetPlayerByIdentifier(citizenid) + if not player then return end + return player.PlayerData.source +end + ---@description Returns a table of the jobs in the framework. ---@return table Framework.GetFrameworkJobs = function() From b90463b7d2af7f6cc81b8500cd4355fa21649d49 Mon Sep 17 00:00:00 2001 From: "Mr.Crowley" Date: Tue, 24 Feb 2026 00:53:37 -0600 Subject: [PATCH 5/8] issue with qb-input checkboxes qb-input was not returning multiple checkboxes correctly. The issue was that the returned data was being overwritten by other return values. example: ```lua local input = { { type = 'input', label = Locale("whitelist.label"), description = Locale("whitelist.description"), required = true, }, { type = 'checkbox', label = Locale("can_whitelist.label"), required = false, }, { type = 'checkbox', label = Locale("whitelist_temp_access.label"), required = false, } } ``` Previously, one of the checkbox values would get overridden. The same issue occurred when using .options. --- modules/input/_default/client.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/input/_default/client.lua b/modules/input/_default/client.lua index d3e6a8f..371db88 100644 --- a/modules/input/_default/client.lua +++ b/modules/input/_default/client.lua @@ -87,10 +87,10 @@ function OxToQBInput(data) input.options = {} if v.options then -- Checks if options varible is valid so checkboxes are bundled together (not used by ox for each checkpoint) for k, j in pairs(v.options) do - table.insert(input.options, {value = j.value, text = j.label, checked = j.checked}) -- added checked option (used to show box as ticked or not) + table.insert(input.options, {value = #returnData + #input.options + 1, text = j.label, checked = j.checked}) -- added checked option (used to show box as ticked or not) end else -- If options is not valid or people pass a single checkbox then it will be a single checkbox per entry - table.insert(input.options, {value = v.value, text = v.label, checked = v.checked}) -- Kept value just incase it's used for other stuffs + table.insert(input.options, {value = #returnData + 1, text = v.label, checked = v.checked}) -- Kept value just incase it's used for other stuffs end end table.insert(returnData, input) From 0088559b912ca6eb6745c34fadedda0c251c8dcd Mon Sep 17 00:00:00 2001 From: "Mr.Crowley" Date: Tue, 24 Feb 2026 01:14:50 -0600 Subject: [PATCH 6/8] qb also returns strings for some reason qb returns "true" or "false" instead of true or false for checkbox's and probably other stuff. Converting to bools to be consistent with ox's returns --- modules/input/qb-input/client.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/input/qb-input/client.lua b/modules/input/qb-input/client.lua index 3742d57..d9dcd5e 100644 --- a/modules/input/qb-input/client.lua +++ b/modules/input/qb-input/client.lua @@ -33,6 +33,7 @@ function Input.Open(title, data, isQBFormat, submitText) for i, v in pairs(returnData) do local index = i and tonumber(i) + v = tostring(v) == "true" and true or (tostring(v) == "false" and false or v) if not index then table.insert(convertedData, v) else From e0c6d2f8c7f70ab00e6dc573b54bbb70992b7dd7 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Fri, 13 Mar 2026 12:35:30 -0400 Subject: [PATCH 7/8] fix for jg-mechanic is missing Replace earlier GetResourceState checks in multiple inventory modules so they only return early when the 'jg-mechanic' resource state is 'missing'. This standardizes behavior across modules (jpr, origen, ox, ps, qb, qs, tgiann) and fixes an inverted check in ox_inventory so the exports['jg-mechanic']:vehiclePlateUpdated call runs unless the resource is actually missing. --- modules/inventory/core_inventory/server.lua | 2 +- modules/inventory/jpr-inventory/server.lua | 2 +- modules/inventory/origen_inventory/server.lua | 2 +- modules/inventory/ox_inventory/server.lua | 2 +- modules/inventory/ps-inventory/server.lua | 2 +- modules/inventory/qb-inventory/server.lua | 4 ++-- modules/inventory/qs-inventory/server.lua | 2 +- modules/inventory/tgiann-inventory/server.lua | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/inventory/core_inventory/server.lua b/modules/inventory/core_inventory/server.lua index c6407e6..64e473f 100644 --- a/modules/inventory/core_inventory/server.lua +++ b/modules/inventory/core_inventory/server.lua @@ -235,7 +235,7 @@ Inventory.UpdatePlate = function(oldplate, newplate) trunk_oldplate = 'trunk-' .. oldplate } MySQL.transaction.await(queries, values) - if GetResourceState('jg-mechanic') ~= 'started' then return true end + if GetResourceState('jg-mechanic') == 'missing' then return true end return true, exports["jg-mechanic"]:vehiclePlateUpdated(oldplate, newplate) end diff --git a/modules/inventory/jpr-inventory/server.lua b/modules/inventory/jpr-inventory/server.lua index d8ce57d..bdd78f8 100644 --- a/modules/inventory/jpr-inventory/server.lua +++ b/modules/inventory/jpr-inventory/server.lua @@ -102,7 +102,7 @@ Inventory.UpdatePlate = function(oldplate, newplate) } local values = { newplate = newplate, oldplate = oldplate } MySQL.transaction.await(queries, values) - if GetResourceState('jg-mechanic') ~= 'started' then return true end + if GetResourceState('jg-mechanic') == 'missing' then return true end return true, exports["jg-mechanic"]:vehiclePlateUpdated(oldplate, newplate) end diff --git a/modules/inventory/origen_inventory/server.lua b/modules/inventory/origen_inventory/server.lua index 9a634cf..4e06f2f 100644 --- a/modules/inventory/origen_inventory/server.lua +++ b/modules/inventory/origen_inventory/server.lua @@ -229,7 +229,7 @@ Inventory.UpdatePlate = function(oldplate, newplate) } local values = { newplate = newplate, oldplate = oldplate } MySQL.transaction.await(queries, values) - if GetResourceState('jg-mechanic') ~= 'started' then return true end + if GetResourceState('jg-mechanic') == 'missing' then return true end return true, exports["jg-mechanic"]:vehiclePlateUpdated(oldplate, newplate) end diff --git a/modules/inventory/ox_inventory/server.lua b/modules/inventory/ox_inventory/server.lua index 7e022ac..dda2f60 100644 --- a/modules/inventory/ox_inventory/server.lua +++ b/modules/inventory/ox_inventory/server.lua @@ -179,7 +179,7 @@ end Inventory.UpdatePlate = function(oldplate, newplate) ox_inventory:UpdateVehicle(oldplate, newplate) -- ox standard doesnt return anything so probably shouldnt return so everything else has the same standard. Yeaaaa probably should change this. - if GetResourceState('jg-mechanic') ~= 'missing' then return true end + if GetResourceState('jg-mechanic') == 'missing' then return true end return true, exports["jg-mechanic"]:vehiclePlateUpdated(oldplate, newplate) end diff --git a/modules/inventory/ps-inventory/server.lua b/modules/inventory/ps-inventory/server.lua index 335bc97..9bf1390 100644 --- a/modules/inventory/ps-inventory/server.lua +++ b/modules/inventory/ps-inventory/server.lua @@ -122,7 +122,7 @@ Inventory.UpdatePlate = function(oldplate, newplate) local values = { newplate = newplate, oldplate = oldplate } MySQL.transaction.await(queries, values) -- ox standard doesnt return anything so probably shouldnt return so everything else has the same standard. Yeaaaa probably should change this. - if GetResourceState('jg-mechanic') ~= 'started' then return true end + if GetResourceState('jg-mechanic') == 'missing' then return true end return true, exports["jg-mechanic"]:vehiclePlateUpdated(oldplate, newplate) end diff --git a/modules/inventory/qb-inventory/server.lua b/modules/inventory/qb-inventory/server.lua index e0ace95..1f626af 100644 --- a/modules/inventory/qb-inventory/server.lua +++ b/modules/inventory/qb-inventory/server.lua @@ -209,7 +209,7 @@ Inventory.UpdatePlate = function(oldplate, newplate) qbInventory:SetInventory('glovebox-'..newplate, storedGloveBox.items, "Community Bridge Moving Items In GloveBox") qbInventory:CreateInventory('trunk-'..newplate, {label = 'trunk-'..newplate, slots = storedTrunk.slots, maxweight = storedTrunk.maxweight}) qbInventory:SetInventory('trunk-'..newplate, storedTrunk.items, "Community Bridge Moving Items In Trunk") - if GetResourceState('jg-mechanic') ~= 'started' then return true end + if GetResourceState('jg-mechanic') == 'missing' then return true end return true, exports["jg-mechanic"]:vehiclePlateUpdated(oldplate, newplate) end @@ -272,7 +272,7 @@ Inventory.Old.UpdatePlate = function(oldplate, newplate) } local values = { newplate = newplate, oldplate = oldplate } MySQL.transaction.await(queries, values) - if GetResourceState('jg-mechanic') ~= 'started' then return true end + if GetResourceState('jg-mechanic') == 'missing' then return true end return true, exports["jg-mechanic"]:vehiclePlateUpdated(oldplate, newplate) end diff --git a/modules/inventory/qs-inventory/server.lua b/modules/inventory/qs-inventory/server.lua index cb7cc4d..4c550cf 100644 --- a/modules/inventory/qs-inventory/server.lua +++ b/modules/inventory/qs-inventory/server.lua @@ -178,7 +178,7 @@ Inventory.UpdatePlate = function(oldplate, newplate) } local values = { newplate = newplate, oldplate = oldplate } MySQL.transaction.await(queries, values) - if GetResourceState('jg-mechanic') ~= 'started' then return true end + if GetResourceState('jg-mechanic') == 'missing' then return true end return true, exports["jg-mechanic"]:vehiclePlateUpdated(oldplate, newplate) end diff --git a/modules/inventory/tgiann-inventory/server.lua b/modules/inventory/tgiann-inventory/server.lua index 2d7b629..c77e0e1 100644 --- a/modules/inventory/tgiann-inventory/server.lua +++ b/modules/inventory/tgiann-inventory/server.lua @@ -155,7 +155,7 @@ Inventory.UpdatePlate = function(oldplate, newplate) local values = { newplate = newplate, oldplate = oldplate } MySQL.transaction.await(queries, values) tgiann:UpdateVehicle(oldplate, newplate) - if GetResourceState('jg-mechanic') ~= 'started' then return true end + if GetResourceState('jg-mechanic') == 'missing' then return true end return true, exports["jg-mechanic"]:vehiclePlateUpdated(oldplate, newplate) end From 6a120b682d343bc704fddde86d3a4746bc654d14 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Fri, 13 Mar 2026 12:39:01 -0400 Subject: [PATCH 8/8] Bump version from 0.13.2 to 0.13.3 --- fxmanifest.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fxmanifest.lua b/fxmanifest.lua index df85653..01eb242 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -5,7 +5,7 @@ use_experimental_fxv2_oal 'yes' author 'The Order of the Sacred Framework' name 'community_bridge' description 'A Universal Bridge for Our Community, created by a group of contributors with a shared vision to enhance both user and developer experiences. This bridge connects various frameworks, inventories, target systems, notification systems, and more, fostering compatibility and seamless integration.' -version '0.13.2' +version '0.13.3' shared_scripts { '@ox_lib/init.lua',