mirror of
https://github.com/jimathy/jim_bridge.git
synced 2026-08-18 14:26:03 +01:00
CoreInv hasItem events updated
This commit is contained in:
15
crafting.lua
15
crafting.lua
@@ -242,8 +242,19 @@ function hasItem(items, amount, src) local amount = amount and amount or 1
|
|||||||
|
|
||||||
elseif GetResourceState(CoreInv):find("start") then
|
elseif GetResourceState(CoreInv):find("start") then
|
||||||
foundInv = CoreInv
|
foundInv = CoreInv
|
||||||
if src then grabInv = exports['core_inventory']:getInventory('primary-'..src)
|
if src then
|
||||||
else grabInv = exports[CoreInv]:getInventory('primary-'..GetPlayerServerId(PlayerPedId()))
|
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
|
end
|
||||||
|
|
||||||
elseif GetResourceState(CodeMInv):find("start") then
|
elseif GetResourceState(CodeMInv):find("start") then
|
||||||
|
|||||||
@@ -513,7 +513,7 @@ function setThirst(src, thirst)
|
|||||||
if GetResourceState(ESXExport):find("start") then
|
if GetResourceState(ESXExport):find("start") then
|
||||||
TriggerClientEvent('esx_status:add', src, 'thirst', thirst)
|
TriggerClientEvent('esx_status:add', src, 'thirst', thirst)
|
||||||
elseif GetResourceState(QBExport):find("start") or GetResourceState(QBXExport):find("start") then
|
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)
|
Player.Functions.SetMetaData('thirst', thirst)
|
||||||
TriggerClientEvent("hud:client:UpdateNeeds", src, thirst, Player.PlayerData.metadata.thirst)
|
TriggerClientEvent("hud:client:UpdateNeeds", src, thirst, Player.PlayerData.metadata.thirst)
|
||||||
end
|
end
|
||||||
@@ -523,7 +523,7 @@ function setHunger(src, hunger)
|
|||||||
if GetResourceState(ESXExport):find("start") then
|
if GetResourceState(ESXExport):find("start") then
|
||||||
TriggerClientEvent('esx_status:add', src, 'hunger', hunger)
|
TriggerClientEvent('esx_status:add', src, 'hunger', hunger)
|
||||||
elseif GetResourceState(QBExport):find("start") or GetResourceState(QBXExport):find("start") then
|
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)
|
Player.Functions.SetMetaData('hunger', hunger)
|
||||||
TriggerClientEvent("hud:client:UpdateNeeds", src, hunger, Player.PlayerData.metadata.hunger)
|
TriggerClientEvent("hud:client:UpdateNeeds", src, hunger, Player.PlayerData.metadata.hunger)
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user