Potential fix for playerInfo is nil

Missed out the math part when adding hunger and thirst to a player when eating items when I reworked the functions

should fix for all frameworks

fxmanifest.lua

@@ -1,6 +1,6 @@
 name "Jim_Bridge"
 author "Jimathy"
-version "2.1.01"
+version "2.1.02"
 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/_authToken.lua

@@ -124,7 +124,6 @@ end
 
 function distExploitCheck(table, src)
     if forceDisableExplotProtection == true then return true end
-
     if not table then
         print("^1Error^7: ^1This wasn^7'^1t reigstered correctly or this is an exploit attempt^1")
         return false
@@ -135,7 +134,7 @@ function distExploitCheck(table, src)
     local allow = false
 
     for i = 1, #table do
-        if #(table[i].xyz  - srcCoords) <= 10 then
+        if #(table[i].xy  - srcCoords.xy) <= 10 then
             return true
         else
             allow = false
@@ -143,7 +142,7 @@ function distExploitCheck(table, src)
     end
 
     if not allow then
-        print(src and ("^1Src ^3"..src.." ").."^1Tried to open a registered shop/stash from over the distance limit^7")
+        print(src and ("^1Src ^3"..src.." ") or "", "^1Tried to open a registered shop/stash from over the distance limit^7")
         return false
     end
 

shared/itemcontrol.lua

@@ -88,7 +88,6 @@ local InvFunc = {
                     inventory = items,
                     society = society,
                 })
-                debugPrint("^6Bridge^7: ^2Registering ^5"..OXInv.." ^3Store^7:", name, "^4Label^7: "..label)
             end,
         openStash =
             function(data)
@@ -123,7 +122,6 @@ local InvFunc = {
         registerStash =
             function(name, label, slots, weight, owner, coords)
                 exports[OXInv]:RegisterStash(name, label, slots or 50, weight or 4000000, owner or nil)
-                debugPrint("^6Bridge^7: ^2Registering ^4"..OXInv.." ^3Stash^7:", name, "^4Label^7: "..label)
             end,
     },
 
@@ -322,7 +320,6 @@ local InvFunc = {
         registerStash =
             function(name, label, slots, weight, owner, coords)
                 exports[OrigenInv]:registerStash(name, label, slots or 50, weight or 4000000)
-                debugPrint("^6Bridge^7: ^2Registering ^4"..OrigenInv.." ^3Stash^7:", name, "^4Label^7: "..label)
             end,
     },
 
@@ -514,7 +511,6 @@ local InvFunc = {
         registerShop =
             function(name, label, items, society)
                 exports[TgiannInv]:RegisterShop(name, items)
-                debugPrint("^6Bridge^7: ^2Registering ^5"..TgiannInv.." ^3Store^7:", name, "^4Label^7: "..label)
             end,
         openStash =
             function(data)
@@ -548,7 +544,6 @@ local InvFunc = {
         registerStash =
             function(name, label, slots, weight, owner, coords)
                 exports[TgiannInv]:RegisterStash(name, label, slots or 50, weight or 4000000)
-                debugPrint("^6Bridge^7: ^2Registering ^4"..TgiannInv.." ^3Stash^7:", name, "^4Label^7: "..label)
             end,
     },
 
@@ -841,7 +836,6 @@ local InvFunc = {
                         items = items,
                         society = society,
                     })
-                    debugPrint("^6Bridge^7: ^2Registering ^5"..QBInv.." ^3Store^7:", name, "^4Label^7: "..label)
                 end
             end,
         openStash =
@@ -1040,7 +1034,6 @@ local InvFunc = {
                         items = items,
                         society = society,
                     })
-                    debugPrint("^6Bridge^7: ^2Registering ^5"..PSInv.." ^3Store^7:", name, "^4Label^7: "..label)
                 end
             end,
         openStash =
@@ -1206,7 +1199,6 @@ local InvFunc = {
                     items = items,
                     society = society,
                 })
-                debugPrint("^6Bridge^7: ^2Registering ^5"..RSGInv.." ^3Store^7:", name, "^4Label^7: "..label)
             end,
         openStash =
             function(data)
@@ -2357,6 +2349,7 @@ function registerStash(name, label, slots, weight, owner, coords)
         local inv = InvFunc[i]
         if isStarted(inv.invName) then
             inv.registerStash(name, label, slots, weight, owner, coords)
+            debugPrint("^6Bridge^7: ^2Registering ^4"..inv.invName.." ^3Stash^7:", name, "^4Label^7: "..label, coords and "- ^4Coord^7: "..formatCoord(coords) or "NO COORD SET")
             break
         end
     end
@@ -2487,6 +2480,7 @@ function sellMenu(data)
                             sellMenu(origData)
                         end
                         v.sellTable = data.sellTable[k]
+                        v.name = data.name
                         sellMenu(v)
                     end,
                 }
@@ -2589,8 +2583,8 @@ RegisterNetEvent(getScript()..":Sellitems", function(data, token)
 end)
 
 function registerSellShop(name, coords)
-    if coords and type(coords) == "vector3" then
+    if coords then
-        print("Registered Sell Shop "..name.." Correctly")
+        debugPrint("^6Bridge^7: ^2Registering ^3Sell Store^7: "..name, coords and "- ^4Coord^7: "..formatCoord(coords) or "NO COORD SET")
         sellShopExploitCheck[name] = sellShopExploitCheck[name] or {}
         sellShopExploitCheck[name][#sellShopExploitCheck[name]+1] = coords
     end
@@ -2690,7 +2684,6 @@ end)
 --- registerShop("weaponShop", "Weapon Shop", weaponItems, "society_weapons")
 --- ```
 function registerShop(name, label, items, society, coords)
-    local shopResource = ""
     -- ensure tables exist
     shopExploitCheck = shopExploitCheck or {}
     shopExploitCheck[name] = shopExploitCheck[name] or {}
@@ -2698,8 +2691,8 @@ function registerShop(name, label, items, society, coords)
     for i = 1, #InvFunc do
         local inv = InvFunc[i]
         if isStarted(inv.invName) then
-            shopResource = inv.invName
             inv.registerShop(name, label, items, society)
+            debugPrint("^6Bridge^7: ^2Registering ^5"..inv.invName.." ^3Store^7:", name, "^4Label^7: "..label, coords and "- ^4Coord^7: "..formatCoord(coords) or "NO COORD SET")
             break
         end
     end
@@ -2710,10 +2703,4 @@ function registerShop(name, label, items, society, coords)
     else
         print("^3Warning^7: ^1Store ^4"..name.." ^1doesn^7'^1t have coords^7, ^1this is exploitable^7, ^1add coords to ^3regiterShop^7()")
     end
-
-    if shopResource ~= "" then
-        debugPrint("^6Bridge^7: ^2Registering ^5"..shopResource.." ^3Store^7:", name, "^4Label^7: "..label)
-    else
-    --    debugPrint("^1ERROR^7: ^1Couldn't find supported inventory to register shop^7:", name)
-    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)
+                local newThirst = Player.PlayerData.metadata.thirst + thirst
-                TriggerClientEvent("hud:client:UpdateNeeds", src, Player.PlayerData.metadata.hunger, 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)
+                local newHunger = Player.PlayerData.metadata.hunger + hunger
-                TriggerClientEvent("hud:client:UpdateNeeds", src, hunger, Player.PlayerData.metadata.thirst)
+                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)
+                local newThirst = Player.PlayerData.metadata.thirst + thirst
-                TriggerClientEvent("hud:client:UpdateNeeds", src, Player.PlayerData.metadata.hunger, 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)
+                local newHunger = Player.PlayerData.metadata.hunger + hunger
-                TriggerClientEvent("hud:client:UpdateNeeds", src, hunger, Player.PlayerData.metadata.thirst)
+                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)
+                local newThirst = Player.PlayerData.metadata.thirst + thirst
-                TriggerClientEvent("hud:client:UpdateNeeds", src, Player.PlayerData.metadata.hunger, 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)
+                local newHunger = Player.PlayerData.metadata.hunger + hunger
-                TriggerClientEvent("hud:client:UpdateNeeds", src, hunger, Player.PlayerData.metadata.thirst)
+                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

version.txt

@@ -1,17 +1,9 @@
-2.1.01
+2.1.02
 
 - Script Overhaul, replace whole script
-- Very alpha support for VorpCore
-- Improve security
 - Removal of Quasar Script Support
 - Support Tgiann-inv's new item system
-- Refactor most multi-functions to be more optimized and smarter
-- Added multifunction bossmenu and clothing functions
-- Added ability to supress update notifcations in fxmanfiest.lua
-- Added coordinate checks to registerStash, registerShop and sellShop
-- Optimize and Enhance built-in progressbar + target functions
-- Improve weird multicharacter issue triggering onPlayerLoaded more than once
-- Scripts that use this will need updating too, as things like stashes won't open
 - **Hotfix for stores and stashes not registering properly**
+- **Hotfix "nil" print and use .xy for distance check**
 
 https://github.com/jimathy/jim_bridge/releases/latest