From 87345fafce71df8825b6d9687cd1e6cb967d3c4b Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Thu, 4 Sep 2025 07:27:40 -0400 Subject: [PATCH] Add GetHunger and GetThirst functions to frameworks Introduced GetHunger and GetThirst functions to client and server files for es_extended, qb-core, and qbx_core frameworks. These functions return the player's hunger and thirst values rounded to the nearest integer, improving consistency in status retrieval. --- modules/framework/es_extended/client.lua | 18 ++++++++++++++++++ modules/framework/es_extended/server.lua | 4 ++-- modules/framework/qb-core/client.lua | 18 ++++++++++++++++++ modules/framework/qb-core/server.lua | 4 ++-- modules/framework/qbx_core/client.lua | 18 ++++++++++++++++++ 5 files changed, 58 insertions(+), 4 deletions(-) diff --git a/modules/framework/es_extended/client.lua b/modules/framework/es_extended/client.lua index a37df82..c3abf66 100644 --- a/modules/framework/es_extended/client.lua +++ b/modules/framework/es_extended/client.lua @@ -124,6 +124,24 @@ Framework.GetPlayerJobData = function() } end +---This will get the hunger of a player +---@return number +Framework.GetHunger = function() + local playerData = Framework.GetPlayerData() + if not playerData then return 0 end + local status = playerData.variables.status + return math.floor((status.hunger.percent) + 0.5) or 0 +end + +---This will get the thirst of a player +---@return number +Framework.GetThirst = function() + local playerData = Framework.GetPlayerData() + if not playerData then return 0 end + local status = playerData.variables.status + return math.floor((status.thirst.percent) + 0.5) or 0 +end + --- @description This will return if the player has the specified item in their inventory --- @param item string --- @return boolean diff --git a/modules/framework/es_extended/server.lua b/modules/framework/es_extended/server.lua index f4a68a6..5f27420 100644 --- a/modules/framework/es_extended/server.lua +++ b/modules/framework/es_extended/server.lua @@ -257,7 +257,7 @@ Framework.GetHunger = function(src) for _, entry in ipairs(status) do if entry.name == "hunger" then - return math.floor(entry.percent) + return math.floor((entry.percent) + 0.5) or 0 end end end @@ -271,7 +271,7 @@ Framework.GetThirst = function(src) for _, entry in ipairs(status) do if entry.name == "thirst" then - return math.floor(entry.percent) + return math.floor((entry.percent) + 0.5) or 0 end end end diff --git a/modules/framework/qb-core/client.lua b/modules/framework/qb-core/client.lua index f734482..55a4725 100644 --- a/modules/framework/qb-core/client.lua +++ b/modules/framework/qb-core/client.lua @@ -109,6 +109,24 @@ Framework.GetItemInfo = function(item) return repackedTable end +---This will get the hunger of a player +---@return number +Framework.GetHunger = function() + local player = Framework.GetPlayerData() + if not player then return 0 end + local playerData = player.PlayerData + return math.floor((playerData.metadata.hunger) + 0.5) or 0 +end + +---This will get the thirst of a player +---@return number +Framework.GetThirst = function() + local player = Framework.GetPlayerData() + if not player then return 0 end + local playerData = player.PlayerData + return math.floor((playerData.metadata.thirst) + 0.5) or 0 +end + ---This will get the players identifier (citizenid) etc. ---@return string Framework.GetPlayerIdentifier = function() diff --git a/modules/framework/qb-core/server.lua b/modules/framework/qb-core/server.lua index 1ba3d10..f346988 100644 --- a/modules/framework/qb-core/server.lua +++ b/modules/framework/qb-core/server.lua @@ -303,7 +303,7 @@ Framework.GetHunger = function(src) if not player then return end local playerData = player.PlayerData local newHunger = (playerData.metadata.hunger or 0) - return newHunger + return math.floor((newHunger) + 0.5) or 0 end ---This will return a boolean if the player is dead or in last stand. @@ -335,7 +335,7 @@ Framework.GetThirst = function(src) if not player then return end local playerData = player.PlayerData local newThirst = (playerData.metadata.thirst or 0) - return newThirst + return math.floor((newThirst) + 0.5) or 0 end -- Framework.GetPlayerPhone(src) diff --git a/modules/framework/qbx_core/client.lua b/modules/framework/qbx_core/client.lua index 7ba21b9..31eb326 100644 --- a/modules/framework/qbx_core/client.lua +++ b/modules/framework/qbx_core/client.lua @@ -68,6 +68,24 @@ Framework.Notify = function(message, type, time) return QBox:Notify("Notification", type, time, message) end +---This will get the hunger of a player +---@return number +Framework.GetHunger = function() + local player = Framework.GetPlayerData() + if not player then return 0 end + local playerData = player.PlayerData + return math.floor((playerData.metadata.hunger) + 0.5) or 0 +end + +---This will get the thirst of a player +---@return number +Framework.GetThirst = function() + local player = Framework.GetPlayerData() + if not player then return 0 end + local playerData = player.PlayerData + return math.floor((playerData.metadata.thirst) + 0.5) or 0 +end + ---This will get the players identifier (citizenid) etc. ---@return string Framework.GetPlayerIdentifier = function()