mirror of
https://github.com/jimathy/jim_bridge.git
synced 2026-08-17 05:56:02 +01:00
Change esx get status to statebag check
This commit is contained in:
@@ -392,41 +392,6 @@ end
|
|||||||
--- ```
|
--- ```
|
||||||
function ConsumeSuccess(itemName, type, data)
|
function ConsumeSuccess(itemName, type, data)
|
||||||
print("^1Deprecated function 'ConsumeSuccess' called, please update your scripts^7")
|
print("^1Deprecated function 'ConsumeSuccess' called, please update your scripts^7")
|
||||||
--local hunger = data and data.hunger or Items[itemName].hunger
|
|
||||||
--local thirst = data and data.thirst or Items[itemName].thirst
|
|
||||||
--
|
|
||||||
--ExecuteCommand("e c")
|
|
||||||
--removeItem(itemName, 1)
|
|
||||||
--
|
|
||||||
--if isStarted(ESXExport) then
|
|
||||||
-- if hunger then
|
|
||||||
-- TriggerServerEvent(getScript()..":server:setNeed", "hunger", tonumber(hunger) * 10000)
|
|
||||||
-- end
|
|
||||||
-- if thirst then
|
|
||||||
-- TriggerServerEvent(getScript()..":server:setNeed", "thirst", tonumber(thirst) * 10000)
|
|
||||||
-- end
|
|
||||||
--else
|
|
||||||
-- if hunger then
|
|
||||||
-- 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"] + tonumber(thirst))
|
|
||||||
-- end
|
|
||||||
--end
|
|
||||||
--
|
|
||||||
--if type == "alcohol" then
|
|
||||||
-- alcoholCount = (alcoholCount or 0) + 1
|
|
||||||
-- if alcoholCount > 1 and alcoholCount < 4 then
|
|
||||||
-- TriggerEvent("evidence:client:SetStatus", "alcohol", 200)
|
|
||||||
-- elseif alcoholCount >= 4 then
|
|
||||||
-- TriggerEvent("evidence:client:SetStatus", "heavyalcohol", 200)
|
|
||||||
-- AlienEffect()
|
|
||||||
-- end
|
|
||||||
--end
|
|
||||||
--
|
|
||||||
--if Config.Reward then
|
|
||||||
-- getRandomReward(itemName)
|
|
||||||
--end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-------------------------------------------------------------
|
-------------------------------------------------------------
|
||||||
@@ -613,6 +578,7 @@ local getPlayerFunc = {
|
|||||||
local Player = {}
|
local Player = {}
|
||||||
local info = ESX.GetPlayerFromId(src)
|
local info = ESX.GetPlayerFromId(src)
|
||||||
if not info then return {} end
|
if not info then return {} end
|
||||||
|
|
||||||
Player = {
|
Player = {
|
||||||
name = info.getName(),
|
name = info.getName(),
|
||||||
cash = info.getMoney(),
|
cash = info.getMoney(),
|
||||||
@@ -629,8 +595,8 @@ local getPlayerFunc = {
|
|||||||
onDuty = info.job.onDuty,
|
onDuty = info.job.onDuty,
|
||||||
--account = info.charinfo.account,
|
--account = info.charinfo.account,
|
||||||
citizenId = info.identifier,
|
citizenId = info.identifier,
|
||||||
hunger = info.status.hunger,
|
hunger = Player(src).state.hunger or 0,
|
||||||
thirst = info.status.thirst,
|
thirst = Player(src).state.thirst or 0,
|
||||||
}
|
}
|
||||||
return Player
|
return Player
|
||||||
end,
|
end,
|
||||||
@@ -646,6 +612,7 @@ local getPlayerFunc = {
|
|||||||
if v.name == "money" then cash = v.money end
|
if v.name == "money" then cash = v.money end
|
||||||
if v.name == "bank" then bank = v.money end
|
if v.name == "bank" then bank = v.money end
|
||||||
end
|
end
|
||||||
|
|
||||||
Player = {
|
Player = {
|
||||||
firstname = info.firstName,
|
firstname = info.firstName,
|
||||||
lastname = info.lastName,
|
lastname = info.lastName,
|
||||||
@@ -662,8 +629,8 @@ local getPlayerFunc = {
|
|||||||
citizenId = info.identifier,
|
citizenId = info.identifier,
|
||||||
isDead = IsEntityDead(PlayerPedId()),
|
isDead = IsEntityDead(PlayerPedId()),
|
||||||
isDown = IsPedDeadOrDying(PlayerPedId(), true),
|
isDown = IsPedDeadOrDying(PlayerPedId(), true),
|
||||||
hunger = info.status.hunger,
|
hunger = LocalPlayer.state.hunger or 0,
|
||||||
thirst = info.status.thirst,
|
thirst = LocalPlayer.state.thirst or 0,
|
||||||
}
|
}
|
||||||
return Player
|
return Player
|
||||||
end,
|
end,
|
||||||
|
|||||||
Reference in New Issue
Block a user