fix ox_inv current inventory weight check

I think this was causing progressbars to return true instead of `nil/false` somehow
this *should* make it more certain

shared/itemcontrol.lua

@@ -56,7 +56,7 @@ local InvFunc = {
                 local weight = 0
                 local itemcheck = getPlayerInv(src)
                 for _, v in pairs(itemcheck) do
-                    weight += ((v.weight * v.amount) or 0)
+                    weight += ((v.weight * (v.amount or v.count)) or 0)
                 end
                 return weight
             end,
@@ -2688,6 +2688,13 @@ function registerShop(name, label, items, society, coords)
     shopExploitCheck = shopExploitCheck or {}
     shopExploitCheck[name] = shopExploitCheck[name] or {}
 
+    if isStarted("jim-shops") then
+        -- Add support for new jim-shops registration export
+        if checkExportExists("jim-shops", "registerShop") then
+            exports["jim-shops"]:registerShop(name, label, items, society, coords)
+        end
+    end
+
     for i = 1, #InvFunc do
         local inv = InvFunc[i]
         if isStarted(inv.invName) then

shared/jobfunctions.lua

@@ -33,6 +33,7 @@ local bossMenuFunc = {
 
     {   name = "esx_society",
         openBossMenu = function(isGang, group)
+            TriggerServerEvent(getScript()..":registerESXSociety", isGang, group)
             TriggerEvent('esx_society:openBossMenu', group, function() end, { wash = false })
         end,
     },
@@ -60,6 +61,20 @@ function openBossMenu(isGang, group)
     end
 end
 
+-- Register ESX Society account in the server
+RegisterNetEvent(getScript()..":registerESXSociety", function(group)
+    local checkExist = exports.esx_society:GetSociety(group)
+    if checkExist == nil then
+        exports.esx_society:registerSociety(
+            group,
+            Gangs[group] and Gangs[group].label or Jobs[group] and Jobs[group].label,
+            group,
+            group,
+            group,
+            {type = "public"}
+        )
+    end
+end)
 
 -------------------------------------------------------------
 -- Global Duty Status

shared/make/cameras.lua

@@ -71,6 +71,7 @@ function startTempCam(cam, renderTime, loadScene, filter, switchCam)
 		-- if moving from a cached previous cam, or you've sent a camre id for it to switch from, interpolate to it
 		if switchCam or cachePrevCam then
 			SetCamActiveWithInterp(cam, cachePrevCam, renderTime or 1000, 0, 0)
+			SetCamActive(cachePrevCam, false) -- Set previous cam inactive (shouldn't be needed but just in case)
 		else
 			SetCamActive(cam, true)
 		end

shared/make/progressBars.lua

@@ -52,7 +52,7 @@ local progressFunc = {
                     if exports[OXLibExport]:progressBar(options) then
                         return true
                     else
-                        print("^1progressBar was not successful")
+                        return false
                     end
                 end
             end,

shared/playerfunctions.lua

@@ -16,14 +16,18 @@ local hungerThirstFunc = {
         setThirst =
             function(src, thirst)
                 local Player = Core.Functions.GetPlayer(src)
-                Player.Functions.SetMetaData('thirst', thirst)
-                TriggerClientEvent("hud:client:UpdateNeeds", src, Player.PlayerData.metadata.hunger, thirst)
+                local newThirst = Player.PlayerData.metadata.thirst + thirst
+                newThirst = (newThirst >= 100.0 and 100.0) or (newThirst <= 0 and 0) or newThirst
+                Player.Functions.SetMetaData('thirst', newThirst)
+                TriggerClientEvent("hud:client:UpdateNeeds", src, Player.PlayerData.metadata.hunger, newThirst)
             end,
         setHunger =
             function(src, hunger)
                 local Player = Core.Functions.GetPlayer(src)
-                Player.Functions.SetMetaData('hunger', hunger)
-                TriggerClientEvent("hud:client:UpdateNeeds", src, hunger, Player.PlayerData.metadata.thirst)
+                local newHunger = Player.PlayerData.metadata.hunger + hunger
+                newHunger = (newHunger >= 100.0 and 100.0) or (newHunger <= 0 and 0) or newHunger
+                Player.Functions.SetMetaData('hunger', newHunger)
+                TriggerClientEvent("hud:client:UpdateNeeds", src, newHunger, Player.PlayerData.metadata.thirst)
             end,
     },
 
@@ -31,14 +35,18 @@ local hungerThirstFunc = {
         setThirst =
             function(src, thirst)
                 local Player = Core.Functions.GetPlayer(src)
-                Player.Functions.SetMetaData('thirst', thirst)
-                TriggerClientEvent("hud:client:UpdateNeeds", src, Player.PlayerData.metadata.hunger, thirst)
+                local newThirst = Player.PlayerData.metadata.thirst + thirst
+                newThirst = (newThirst >= 100.0 and 100.0) or (newThirst <= 0 and 0) or newThirst
+                Player.Functions.SetMetaData('thirst', newThirst)
+                TriggerClientEvent("hud:client:UpdateNeeds", src, Player.PlayerData.metadata.hunger, newThirst)
             end,
         setHunger =
             function(src, hunger)
                 local Player = Core.Functions.GetPlayer(src)
-                Player.Functions.SetMetaData('hunger', hunger)
-                TriggerClientEvent("hud:client:UpdateNeeds", src, hunger, Player.PlayerData.metadata.thirst)
+                local newHunger = Player.PlayerData.metadata.hunger + hunger
+                newHunger = (newHunger >= 100.0 and 100.0) or (newHunger <= 0 and 0) or newHunger
+                Player.Functions.SetMetaData('hunger', newHunger)
+                TriggerClientEvent("hud:client:UpdateNeeds", src, newHunger, Player.PlayerData.metadata.thirst)
             end,
     },
 
@@ -46,25 +54,29 @@ local hungerThirstFunc = {
         setThirst =
             function(src, thirst)
                 local Player = Core.Functions.GetPlayer(src)
-                Player.Functions.SetMetaData('thirst', thirst)
-                TriggerClientEvent("hud:client:UpdateNeeds", src, Player.PlayerData.metadata.hunger, thirst)
+                local newThirst = Player.PlayerData.metadata.thirst + thirst
+                newThirst = (newThirst >= 100.0 and 100.0) or (newThirst <= 0 and 0) or newThirst
+                Player.Functions.SetMetaData('thirst', newThirst)
+                TriggerClientEvent("hud:client:UpdateNeeds", src, Player.PlayerData.metadata.hunger, newThirst)
             end,
         setHunger =
             function(src, hunger)
                 local Player = Core.Functions.GetPlayer(src)
-                Player.Functions.SetMetaData('hunger', hunger)
-                TriggerClientEvent("hud:client:UpdateNeeds", src, hunger, Player.PlayerData.metadata.thirst)
+                local newHunger = Player.PlayerData.metadata.hunger + hunger
+                newHunger = (newHunger >= 100.0 and 100.0) or (newHunger <= 0 and 0) or newHunger
+                Player.Functions.SetMetaData('hunger', newHunger)
+                TriggerClientEvent("hud:client:UpdateNeeds", src, newHunger, Player.PlayerData.metadata.thirst)
             end,
     },
 
     {   framework = ESXExport,
         setThirst =
             function(src, thirst)
-                TriggerClientEvent('esx_status:add', src, 'thirst', thirst)
+                TriggerClientEvent('esx_status:add', src, 'thirst', tonumber(thirst) * 10000)
             end,
         setHunger =
             function(src, hunger)
-                TriggerClientEvent('esx_status:add', src, 'hunger', hunger)
+                TriggerClientEvent('esx_status:add', src, 'hunger', tonumber(hunger) * 10000)
             end,
     },
 }
@@ -372,19 +384,21 @@ local hasGroupFunc = {
                 local hasJobFlag, duty = false, true
                 local playerInfo = GetPlayer(src)
                 local jobinfo = playerInfo.job or playerInfo.PlayerData.job
-                if jobinfo.name == group then
+                if jobinfo and jobinfo.name == group then
                     hasJobFlag = true
                     duty = jobinfo.onduty
                     if grade and not (grade <= jobinfo.grade.level) then
                         hasJobFlag = false
                     end
+                    return hasJobFlag, duty
                 end
                 local ganginfo = playerInfo.gang or playerInfo.PlayerData.gang
-                if ganginfo.name == group then
+                if ganginfo and ganginfo.name == group then
                     hasJobFlag = true
                     if grade and not (grade <= ganginfo.grade.level) then
                         hasJobFlag = false
                     end
+                    return hasJobFlag, duty
                 end
                 return hasJobFlag, duty
             end,
@@ -396,7 +410,7 @@ local hasGroupFunc = {
                 local hasJobFlag, duty = false, true
                 local playerInfo = GetPlayer(src)
                 local jobinfo = playerInfo.job or playerInfo.PlayerData.job
-                if jobinfo.name == group then
+                if jobinfo and jobinfo.name == group then
                     hasJobFlag = true
                     duty = jobinfo.onduty
                     if grade and not (grade <= jobinfo.grade.level) then
@@ -404,7 +418,7 @@ local hasGroupFunc = {
                     end
                 end
                 local ganginfo = playerInfo.gang or playerInfo.PlayerData.gang
-                if ganginfo.name == group then
+                if ganginfo and ganginfo.name == group then
                     hasJobFlag = true
                     if grade and not (grade <= ganginfo.grade.level) then
                         hasJobFlag = false
@@ -434,26 +448,6 @@ local hasGroupFunc = {
             end,
     },
 
-    {   framework = OXCoreExport,
-        hasGroup =
-            function(group, grade, src)
-                local hasJobFlag, duty = false, true
-                if src then
-                    local chunk = assert(load(LoadResourceFile('ox_core', ('imports/%s.lua'):format('server')), ('@@ox_core/%s'):format(file)))
-                    chunk()
-                    local player = Ox.GetPlayer(src)
-                    for k, v in pairs(player.getGroups()) do
-                        if k == group then hasJobFlag = true end
-                    end
-                end
-                local info = OxPlayer.getGroups()
-                for k, v in pairs(info) do
-                    if k == group then hasJobFlag = true break end
-                end
-                return hasJobFlag, duty
-            end,
-    },
-
     {   framework = ESXExport,
         hasGroup =
             function(group, grade, src)
@@ -479,7 +473,7 @@ local hasGroupFunc = {
                 local hasJobFlag, duty = false, true
                 local playerInfo = GetPlayer(src)
                 local jobinfo = playerInfo.job or playerInfo.PlayerData.job
-                if jobinfo.name == group then
+                if jobinfo and jobinfo.name == group then
                     hasJobFlag = true
                     duty = jobinfo.onduty
                     if grade and not (grade <= jobinfo.grade.level) then
@@ -487,7 +481,7 @@ local hasGroupFunc = {
                     end
                 end
                 local ganginfo = playerInfo.gang or playerInfo.PlayerData.gang
-                if ganginfo.name == group then
+                if ganginfo and ganginfo.name == group then
                     hasJobFlag = true
                     if grade and not (grade <= ganginfo.grade.level) then
                         hasJobFlag = false

shared/societybank.lua

@@ -12,52 +12,6 @@
 ]]
 
 local societyFunc = {
-    {   bankName = "qb-banking",
-        getAccount =
-            function(society)
-                if not exports["qb-banking"]:GetAccount(society) then
-                    if Jobs[society] then
-                        print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
-                        exports["qb-banking"]:CreateJobAccount(society, 0)
-                        Wait(150)
-                    elseif Gangs[society] then
-                        print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
-                        exports["qb-banking"]:CreateGangAccount(society, 0)
-                        Wait(150)
-                    end
-                end
-                return exports["qb-banking"]:GetAccountBalance(society)
-            end,
-        chargeSociety =
-            function(society, amount)
-                if not exports["qb-banking"]:GetAccount(society) then
-                    if Jobs[society] then
-                        print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
-                        exports["qb-banking"]:CreateJobAccount(society, 0) Wait(150) -- make new account if return "null"
-                    elseif Gangs[society] then
-                        print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
-                        exports["qb-banking"]:CreateGangAccount(society, 0) Wait(150) -- make new account if return "null"
-                    end
-                end
-                exports["qb-banking"]:RemoveMoney(society, amount)
-            end,
-        fundSociety =
-            function(society, amount)
-                if not exports["qb-banking"]:GetAccount(society) then
-                    if Jobs[society] then
-                        print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
-                        exports["qb-banking"]:CreateJobAccount(society, 0)
-                        Wait(150)
-                    elseif Gangs[society] then
-                        print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
-                        exports["qb-banking"]:CreateGangAccount(society, 0)
-                        Wait(150)
-                    end
-                end
-                exports["qb-banking"]:AddMoney(society, amount)
-            end,
-    },
-
     {   bankName = "Renewed-Banking",
         getAccount =
             function(society)
@@ -129,6 +83,115 @@ local societyFunc = {
                 end
             end,
     },
+
+    {   bankName = "qb-banking",
+        getAccount =
+            function(society)
+                if not exports["qb-banking"]:GetAccount(society) then
+                    if Jobs[society] then
+                        print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
+                        exports["qb-banking"]:CreateJobAccount(society, 0)
+                        Wait(150)
+                    elseif Gangs[society] then
+                        print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
+                        exports["qb-banking"]:CreateGangAccount(society, 0)
+                        Wait(150)
+                    end
+                end
+                return exports["qb-banking"]:GetAccountBalance(society)
+            end,
+        chargeSociety =
+            function(society, amount)
+                if not exports["qb-banking"]:GetAccount(society) then
+                    if Jobs[society] then
+                        print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
+                        exports["qb-banking"]:CreateJobAccount(society, 0) Wait(150) -- make new account if return "null"
+                    elseif Gangs[society] then
+                        print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
+                        exports["qb-banking"]:CreateGangAccount(society, 0) Wait(150) -- make new account if return "null"
+                    end
+                end
+                exports["qb-banking"]:RemoveMoney(society, amount)
+            end,
+        fundSociety =
+            function(society, amount)
+                if not exports["qb-banking"]:GetAccount(society) then
+                    if Jobs[society] then
+                        print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
+                        exports["qb-banking"]:CreateJobAccount(society, 0)
+                        Wait(150)
+                    elseif Gangs[society] then
+                        print("^6Bridge^7: ^2Making new bank account in ^7'^3qb-banking^7' ^2for ^7'^3"..society.."^7'")
+                        exports["qb-banking"]:CreateGangAccount(society, 0)
+                        Wait(150)
+                    end
+                end
+                exports["qb-banking"]:AddMoney(society, amount)
+            end,
+    },
+
+    {   bankName = "esx_society",
+        getAccount =
+            function(society)
+                local checkExist = exports.esx_society:GetSociety(society)
+                if checkExist == nil then
+                    print("^6Bridge^7: ^2Making new bank account in ^7'^3esx_society^7' ^2for ^7'^3"..society.."^7'")
+                    exports.esx_society:registerSociety(
+                        society,
+                        Gangs[society] and Gangs[society].label or Jobs[society] and Jobs[society].label,
+                        society,
+                        society,
+                        society,
+                        {type = "public"}
+                    )
+                end
+                local p = promise.new()
+                TriggerEvent('esx_addonaccount:getSharedAccount', checkExist.account, function(account)
+                    p:resolve(account.money)
+                end)
+                local newAmount = Citizen.Await(p)
+                return newAmount
+            end,
+        chargeSociety =
+            function(society, amount)
+                local checkExist = exports.esx_society:GetSociety(society)
+                if checkExist == nil then
+                    print("^6Bridge^7: ^2Making new bank account in ^7'^3esx_society^7' ^2for ^7'^3"..society.."^7'")
+                    exports.esx_society:registerSociety(
+                        society,
+                        Gangs[society] and Gangs[society].label or Jobs[society] and Jobs[society].label,
+                        society,
+                        society,
+                        society,
+                        {type = "public"}
+                    )
+                end
+                TriggerEvent('esx_addonaccount:getSharedAccount', checkExist.account, function(account)
+                    if amount > 0 and account.money >= amount then
+                        account.removeMoney(amount)
+                    end
+                end)
+            end,
+        fundSociety =
+            function(society, amount)
+                local checkExist = exports.esx_society:GetSociety(society)
+                if checkExist == nil then
+                    print("^6Bridge^7: ^2Making new bank account in ^7'^3esx_society^7' ^2for ^7'^3"..society.."^7'")
+                    exports.esx_society:registerSociety(
+                        society,
+                        Gangs[society] and Gangs[society].label or Jobs[society] and Jobs[society].label,
+                        society,
+                        society,
+                        society,
+                        {type = "public"}
+                    )
+                end
+                TriggerEvent('esx_addonaccount:getSharedAccount', checkExist.account, function(account)
+                    account.addMoney(amount)
+                end)
+            end,
+    },
+
 }
 
 
@@ -200,14 +263,4 @@ function fundSociety(society, amount)
     end
 
     print("^1Error^7: ^3FundSociety^7: ^2No supported banking script found")
-end
-
-
--- other
-if isStarted("esx_society") then
-    createCallback(getScript()..":getESXSocietyAccount", function(source, society)
-        -- Example query – adjust table/field names to match your esx_society implementation.
-        local result = MySQL.scalar.await('SELECT money FROM society_money WHERE society = ?', { society })
-        return result or 0
-    end)
 end

shared/targets.lua

@@ -33,7 +33,7 @@ local targetFunc = {
                         canInteract = opts[i].canInteract or nil,
                     }
                 end
-                exports[OXTargetExport]:addLocalEntity(entity, options)
+                return exports[OXTargetExport]:addLocalEntity(entity, options)
             end,
 
         boxTarget =
@@ -105,7 +105,7 @@ local targetFunc = {
                         canInteract = opts[i].canInteract or nil,
                     }
                 end
-                exports[OXTargetExport]:addModel(models, options)
+                return exports[OXTargetExport]:addModel(models, options)
             end,
 
         removeTargetEntity =
@@ -128,7 +128,7 @@ local targetFunc = {
         entityTarget =
             function(entity, opts, dist)
                 local options = { options = opts, distance = dist }
-                exports[QBTargetExport]:AddTargetEntity(entity, options)
+                return exports[QBTargetExport]:AddTargetEntity(entity, options)
             end,
 
         boxTarget =
@@ -148,7 +148,7 @@ local targetFunc = {
         modelTarget =
             function(models, opts, dist)
                 local options = { options = opts, distance = dist }
-                exports[QBTargetExport]:AddTargetModel(models, options)
+                return exports[QBTargetExport]:AddTargetModel(models, options)
             end,
 
         removeTargetEntity =
@@ -213,11 +213,10 @@ local targetFunc = {
 
 
 -- Tables for storing created targets for the fallback system and zone management.
-local TextTargets    = {}   -- For fallback DrawText3D targets.
 local targetEntities = {}   -- For entity targets.
 local boxTargets     = {}   -- For box-shaped zone targets.
 local circleTargets  = {}   -- For circular zone targets.
-
+local modelTargets   = {}
 -------------------------------------------------------------
 -- Entity Target Creation
 -------------------------------------------------------------
@@ -442,7 +441,7 @@ function createModelTarget(models, opts, dist)
         if isStarted(script.targetName) then
             debugPrint("^6Bridge^7: ^2Creating new ^3Model ^2target with ^6"..script.targetName.."^7")
             local target = script.modelTarget(models, opts, dist)
-            circleTargets[#circleTargets + 1] = target
+            modelTargets[#modelTargets + 1] = target
             return target
         end
     end
@@ -553,7 +552,7 @@ local function CleanupTargets()
         if isStarted(OXTargetExport) then
             exports[OXTargetExport]:removeZone(boxTargets[i], true)
         elseif isStarted(QBTargetExport) then
-            exports[QBTargetExport]:RemoveZone(boxTargets[i].name)
+            exports[QBTargetExport]:RemoveZone(boxTargets[i])
         end
     end
     -- Remove circle zone targets.
@@ -561,7 +560,7 @@ local function CleanupTargets()
         if isStarted(OXTargetExport) then
             exports[OXTargetExport]:removeZone(circleTargets[i], true)
         elseif isStarted(QBTargetExport) then
-            exports[QBTargetExport]:RemoveZone(circleTargets[i].name)
+            exports[QBTargetExport]:RemoveZone(circleTargets[i])
         end
     end
 end

shared/wrapperfunctions.lua

@@ -1,4 +1,3 @@
-
 --- Registers a command with the active command system.
 --- This function supports multiple command systems (OXLib, qb-core, ESX Legacy).
 ---
@@ -47,7 +46,7 @@ function registerCommand(command, options)
             optionTable.helpInfo,
             optionTable.subText,
             optionTable.argsRequired,
-            optionTable.funt,
+            optionTable.funct,
             optionTable.restriction or nil
         )
 
@@ -57,7 +56,7 @@ function registerCommand(command, options)
             optionTable.helpInfo,
             optionTable.subText,
             optionTable.argsRequired,
-            optionTable.funt,
+            optionTable.funct,
             optionTable.restriction or nil
         )