From f1ff06c0983cb37f2cf4e20f4dc92afced404494 Mon Sep 17 00:00:00 2001
From: Jim Shield <gothicjim@gmail.com>
Date: Mon, 22 Jan 2024 15:31:04 +0000
Subject: [PATCH] CoreInv hasItem events updated

---
 crafting.lua  | 15 +++++++++++++--
 functions.lua |  4 ++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/crafting.lua b/crafting.lua
index 0b9c381..48550f5 100644
--- a/crafting.lua
+++ b/crafting.lua
@@ -242,8 +242,19 @@ function hasItem(items, amount, src) local amount = amount and amount or 1
 
     elseif GetResourceState(CoreInv):find("start") then
         foundInv = CoreInv
-        if src then grabInv = exports['core_inventory']:getInventory('primary-'..src)
-        else grabInv = exports[CoreInv]:getInventory('primary-'..GetPlayerServerId(PlayerPedId()))
+        if src then
+            if GetResourceState(QBExport):find("start") or GetResourceState(QBXExport):find("start") then
+                local Player = Core.Functions.GetPlayer(src)
+                grabInv = Player.PlayerData.inventory
+            elseif GetResourceState(ESXExport):find("start") then
+                local Player = ESX.GetPlayerFromId(src)
+                grabInv = Player.getInventory(false)
+            end
+        else
+            local p = promise.new()
+            Core.Functions.TriggerCallback('core_inventory:server:getInventory', function(cb) p:resolve(cb) end)
+            local result = Citizen.Await(p)
+            grabInv = result
         end
 
     elseif GetResourceState(CodeMInv):find("start") then
diff --git a/functions.lua b/functions.lua
index 9c1ca02..002761e 100644
--- a/functions.lua
+++ b/functions.lua
@@ -513,7 +513,7 @@ function setThirst(src, thirst)
 	if GetResourceState(ESXExport):find("start") then
 		TriggerClientEvent('esx_status:add', src, 'thirst', thirst)
 	elseif GetResourceState(QBExport):find("start") or GetResourceState(QBXExport):find("start") then
-		local Player = QBCore.Functions.GetPlayer(src)
+		local Player = Core.Functions.GetPlayer(src)
 		Player.Functions.SetMetaData('thirst', thirst)
 		TriggerClientEvent("hud:client:UpdateNeeds", src, thirst, Player.PlayerData.metadata.thirst)
 	end
@@ -523,7 +523,7 @@ function setHunger(src, hunger)
 	if GetResourceState(ESXExport):find("start") then
 		TriggerClientEvent('esx_status:add', src, 'hunger', hunger)
 	elseif GetResourceState(QBExport):find("start") or GetResourceState(QBXExport):find("start") then
-		local Player = QBCore.Functions.GetPlayer(src)
+		local Player = Core.Functions.GetPlayer(src)
 		Player.Functions.SetMetaData('hunger', hunger)
 		TriggerClientEvent("hud:client:UpdateNeeds", src, hunger, Player.PlayerData.metadata.hunger)
 	end