Version Bump

`2.0.08` - `2.0.09`

fxmanifest.lua

@@ -1,6 +1,6 @@
 name "Jim_Bridge"
 author "Jimathy"
-version "2.0.08"
+version "2.0.09"
 description "Framework Bridge By Jimathy"
 fx_version "cerulean"
 rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.'

shared/coreloader.lua

@@ -240,24 +240,30 @@ elseif isStarted(QBExport) then
 elseif isStarted(ESXExport) then
     jobResource = ESXExport
     if isServer() then
+        -- If server, create callback to get jobs
+        createCallback(getScript()..":getESXJobs", function(source)
+            return Jobs
+        end)
+        -- Populate jobs table with ESX.GetJobs()
         Jobs = ESX.GetJobs()
+        --If retreived jobs is empty, wait for ESX to load
+        while countTable(Jobs) == 0 do
+            Jobs = ESX.GetJobs()
+            Wait(100)
+        end
+        -- Organise into a table the script can use
         for k, v in pairs(Jobs) do
             local count = countTable(Jobs[k].grades) - 1
             Jobs[k].grades[tostring(count)].isBoss = true
         end
+        -- ESX Default doesn't have gangs, so copy jobs to gangs
+        Gangs = Jobs
+    end
+    -- If client side, trigger callback to get jobs
+    if not isServer() then
+        Jobs = triggerCallback(getScript()..":getESXJobs")
         Gangs = Jobs
     end
-    CreateThread(function()
-        if isServer() then
-            createCallback(getScript()..":getJobs", function(source)
-                return Jobs
-            end)
-        end
-        if not isServer() then
-            Jobs = triggerCallback(getScript()..":getJobs")
-            Gangs = Jobs
-        end
-    end)
 
 elseif isStarted(RSGExport) then
     jobResource = RSGExport
@@ -272,7 +278,7 @@ end
 if jobResource == nil then
     print("^4ERROR^7: ^2No Vehicle info detected ^7- ^2Check ^3starter^1.^2lua^7")
 else
-    while not Jobs do Wait(100) end
+    while not Jobs do Wait(1000) end
     debugPrint("^6Bridge^7: ^2Loading ^6"..countTable(Jobs).." ^3Jobs^2 from ^7"..jobResource)
     debugPrint("^6Bridge^7: ^2Loading ^6"..countTable(Gangs).." ^3Gangs^2 from ^7"..jobResource)
 end

shared/crafting.lua

@@ -462,7 +462,9 @@ RegisterNetEvent(getScript()..":Crafting:GetItem", function(ItemMake, craftable,
                 stashItems = getStash(name)
                 for k, v in pairs(craftable[ItemMake] or {}) do
                     for _, b in pairs(stashItems or {}) do
-                        if k == b.name then itemRemove[k] = v end
+                        if k == b.name then
+                            itemRemove[k] = v
+                        end
                     end
                 end
             end
@@ -470,7 +472,9 @@ RegisterNetEvent(getScript()..":Crafting:GetItem", function(ItemMake, craftable,
             stashItems = getStash(stashName)
             for k, v in pairs(craftable[ItemMake] or {}) do
                 for _, b in pairs(stashItems or {}) do
-                    if k == b.name then itemRemove[k] = v end
+                    if k == b.name then
+                        itemRemove[k] = v
+                    end
                 end
             end
         end

shared/playerfunctions.lua

@@ -301,17 +301,17 @@ function ConsumeSuccess(itemName, type, data)
 
     if isStarted(ESXExport) then
         if hunger then
-            TriggerServerEvent(getScript()..":server:setNeed", "hunger", hunger * 10000)
+            TriggerServerEvent(getScript()..":server:setNeed", "hunger", tonumber(hunger) * 10000)
         end
         if thirst then
-            TriggerServerEvent(getScript()..":server:setNeed", "thirst", thirst * 10000)
+            TriggerServerEvent(getScript()..":server:setNeed", "thirst", tonumber(thirst) * 10000)
         end
     else
         if hunger then
-            TriggerServerEvent(getScript()..":server:setNeed", "hunger", Core.Functions.GetPlayerData().metadata["hunger"] + hunger)
+            TriggerServerEvent(getScript()..":server:setNeed", "hunger", Core.Functions.GetPlayerData().metadata["hunger"] + tonumber(hunger))
         end
         if thirst then
-            TriggerServerEvent(getScript()..":server:setNeed", "thirst", Core.Functions.GetPlayerData().metadata["thirst"] + thirst)
+            TriggerServerEvent(getScript()..":server:setNeed", "thirst", Core.Functions.GetPlayerData().metadata["thirst"] + tonumber(thirst))
         end
     end
 
@@ -325,7 +325,9 @@ function ConsumeSuccess(itemName, type, data)
         end
     end
 
-    getRandomReward(itemName)
+    if Config.Reward then
+        getRandomReward(itemName)
+    end
 end
 
 -------------------------------------------------------------

shared/stashcontrol.lua

@@ -332,34 +332,22 @@ function stashRemoveItem(stashItems, stashName, items)
     if type(stashName) ~= "table" then
         stashName = { stashName }
     end
+
     if isStarted(OXInv) then
         for k, v in pairs(items) do
-            if type(stashName) == "table" then
+            for _, name in pairs(stashName) do
-                for _, name in pairs(stashName) do
+                local success = exports[OXInv]:RemoveItem(name, k, v)
-                    local success = exports[OXInv]:RemoveItem(name, k, v)
+                if success then
-                    if success then
+                    debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..OXInv, k, v)
-                        debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..OXInv, k, v)
+                    break
-                        break
-                    end
                 end
-            else
-                exports[OXInv]:RemoveItem(stashName, k, v)
             end
         end
 
     elseif isStarted(QSInv) then
         for k, v in pairs(items) do
-            for l in pairs(stashItems) do
+            exports[QSInv]:RemoveItemIntoStash(stashName[1], k, v)
-                if stashItems[l].name == k then
+            debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..QSInv, k, v)
-                    if (stashItems[l].amount - v) <= 0 then
-                        debugPrint("^6Bridge^7: ^2None of this item left in stash ^3Stash^7", k, v)
-                        stashItems[l] = nil
-                    else
-                        debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..QSInv, k, v)
-                        exports[QSInv]:RemoveItemIntoStash(stashName[1], k, v, l)
-                    end
-                end
-            end
         end
 
     elseif isStarted(CoreInv) then
@@ -393,7 +381,7 @@ function stashRemoveItem(stashItems, stashName, items)
 
     elseif isStarted(TgiannInv) then
         for k, v in pairs(items) do
-            local itemData = exports["tgiann-inventory"]:GetItemByNameFromSecondaryInventory("stash", stashName[1], k)
+            local itemData = exports[TgiannInv]:GetItemByNameFromSecondaryInventory("stash", stashName[1], k)
             exports[TgiannInv]:RemoveItemFromSecondaryInventory("stash", stashName[1], k, v, itemData.slot, nil)
             debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..TgiannInv, k, v)
         end
@@ -404,11 +392,6 @@ function stashRemoveItem(stashItems, stashName, items)
                 exports[QBInv]:RemoveItem(stashName[1], k, v, false, 'crafting')
                 debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..QBInv, k, v)
             end
-            debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3QB^2 stash ^7'^6"..stashName[1].."^7'")
-            MySQL.Async.insert('INSERT INTO inventories (identifier, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', {
-                ['stash'] = stashName[1],
-                ['items'] = json.encode(stashItems)
-            })
         else
             for k, v in pairs(items) do
                 for l in pairs(stashItems) do
@@ -423,14 +406,13 @@ function stashRemoveItem(stashItems, stashName, items)
                     end
                 end
             end
-            debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3QB^2 stash '^6"..stashName.."^7'")
+            debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3QB^2 stash '^6"..stashName[1].."^7'")
             MySQL.Async.insert('INSERT INTO stashitems (stash, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', {
-                ['stash'] = stashName,
+                ['stash'] = stashName[1],
                 ['items'] = json.encode(stashItems)
             })
         end
 
-
     elseif isStarted(PSInv) then
         for k, v in pairs(items) do
             for l in pairs(stashItems) do
@@ -445,9 +427,9 @@ function stashRemoveItem(stashItems, stashName, items)
                 end
             end
         end
-        debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3QB^2 stash ^7'^6"..stashName.."^7'")
+        debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3PS^2 stash ^7'^6"..stashName[1].."^7'")
         MySQL.Async.insert('INSERT INTO stashitems (stash, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', {
-            ['stash'] = stashName,
+            ['stash'] = stashName[1],
             ['items'] = json.encode(stashItems)
         })
 
@@ -456,11 +438,6 @@ function stashRemoveItem(stashItems, stashName, items)
             exports[RSGInv]:RemoveItem(stashName[1], k, v, false, 'crafting')
             debugPrint("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..RSGInv, k, v)
         end
-        debugPrint("^6Bridge^7: ^3saveStash^7: ^2Saving ^3QB^2 stash ^7'^6"..stashName[1].."^7'")
-        MySQL.Async.insert('INSERT INTO inventories (identifier, items) VALUES (:stash, :items) ON DUPLICATE KEY UPDATE items = :items', {
-            ['stash'] = stashName[1],
-            ['items'] = json.encode(stashItems)
-        })
     else
         print("^4ERROR^7: ^2No Inventory detected ^7- ^2Check ^3starter^1.^2lua^7")
     end

version.txt

@@ -1 +1 @@
-2.0.08
+2.0.09