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 1/7] 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() From cfd746d889be777e6be49dc18af047097e4d8224 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Thu, 4 Sep 2025 07:35:21 -0400 Subject: [PATCH 2/7] Refactor hunger and thirst retrieval logic Introduced Framework.GetStatusData to centralize status lookup. Updated GetHunger and GetThirst to use the new function, improving code reuse and maintainability. --- modules/framework/es_extended/client.lua | 25 ++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/modules/framework/es_extended/client.lua b/modules/framework/es_extended/client.lua index c3abf66..1980d6d 100644 --- a/modules/framework/es_extended/client.lua +++ b/modules/framework/es_extended/client.lua @@ -124,22 +124,31 @@ Framework.GetPlayerJobData = function() } end +--This is an internal function to get status data +--- @param search string +Framework.GetStatusData = function(search) + local playerData = Framework.GetPlayerData() + local status = playerData.variables.status + for _, entry in ipairs(status) do + if entry.name == search then + return entry.percent or 0 + end + end + return 0 +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 + local status = Framework.GetStatusData("hunger") + return math.floor((status) + 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 + local status = Framework.GetStatusData("thirst") + return math.floor((status) + 0.5) or 0 end --- @description This will return if the player has the specified item in their inventory From 943f86d47bc2a468ad32fc7b1e3939f8a9a0e467 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Thu, 4 Sep 2025 07:38:50 -0400 Subject: [PATCH 3/7] Add nil check for player data in GetStatusData Prevents errors by returning 0 if player data is unavailable when calling Framework.GetStatusData. --- modules/framework/es_extended/client.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/framework/es_extended/client.lua b/modules/framework/es_extended/client.lua index 1980d6d..e8f1d34 100644 --- a/modules/framework/es_extended/client.lua +++ b/modules/framework/es_extended/client.lua @@ -128,6 +128,7 @@ end --- @param search string Framework.GetStatusData = function(search) local playerData = Framework.GetPlayerData() + if not playerData then return 0 end local status = playerData.variables.status for _, entry in ipairs(status) do if entry.name == search then From aae3d540ff914b43141e861f8635107fac5bbbaa Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Thu, 4 Sep 2025 08:13:47 -0400 Subject: [PATCH 4/7] Update server.lua --- modules/framework/es_extended/server.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/framework/es_extended/server.lua b/modules/framework/es_extended/server.lua index 5f27420..6af30ab 100644 --- a/modules/framework/es_extended/server.lua +++ b/modules/framework/es_extended/server.lua @@ -252,9 +252,9 @@ end --- @param src number --- @return number | nil Framework.GetHunger = function(src) - local status = Framework.GetStatus(src, "status") - if not status then return nil end - + local status = Framework.GetStatus(src, "hunger") + if not status then return end + if type(status) ~= "table" then return end for _, entry in ipairs(status) do if entry.name == "hunger" then return math.floor((entry.percent) + 0.5) or 0 @@ -266,9 +266,9 @@ end --- @param src any --- @return number | nil Framework.GetThirst = function(src) - local status = Framework.GetStatus(src, "status") + local status = Framework.GetStatus(src, "thirst") if not status then return nil end - + if type(status) ~= "table" then return end for _, entry in ipairs(status) do if entry.name == "thirst" then return math.floor((entry.percent) + 0.5) or 0 From 8bf02f6372a0d57f2cf14e959eeb9ae5dd13c47d Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Thu, 4 Sep 2025 08:15:02 -0400 Subject: [PATCH 5/7] Fix hunger and thirst status retrieval Changed Framework.GetHunger and Framework.GetThirst to fetch the 'status' instead of 'hunger' or 'thirst' directly. This ensures the functions correctly iterate over the status table to find the relevant values. --- modules/framework/es_extended/server.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/framework/es_extended/server.lua b/modules/framework/es_extended/server.lua index 6af30ab..e1abfc0 100644 --- a/modules/framework/es_extended/server.lua +++ b/modules/framework/es_extended/server.lua @@ -252,7 +252,7 @@ end --- @param src number --- @return number | nil Framework.GetHunger = function(src) - local status = Framework.GetStatus(src, "hunger") + local status = Framework.GetStatus(src, "status") if not status then return end if type(status) ~= "table" then return end for _, entry in ipairs(status) do @@ -266,7 +266,7 @@ end --- @param src any --- @return number | nil Framework.GetThirst = function(src) - local status = Framework.GetStatus(src, "thirst") + local status = Framework.GetStatus(src, "status") if not status then return nil end if type(status) ~= "table" then return end for _, entry in ipairs(status) do From 08c3d937d61fa4ed4702d433b95312109fdbb679 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Wed, 10 Sep 2025 11:19:55 -0400 Subject: [PATCH 6/7] Round hunger and thirst values to nearest integer Updated GetHunger and GetThirst functions to return rounded integer values using math.floor(value + 0.5) for consistency and to avoid floating point results. --- modules/framework/qbx_core/server.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/framework/qbx_core/server.lua b/modules/framework/qbx_core/server.lua index de994dd..e20c2c5 100644 --- a/modules/framework/qbx_core/server.lua +++ b/modules/framework/qbx_core/server.lua @@ -234,7 +234,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. @@ -265,7 +265,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 ---Returns the phone number of the player. From f4e5d9485f38460e4c9473dc43bcc9c4a364430f Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Wed, 10 Sep 2025 11:29:19 -0400 Subject: [PATCH 7/7] Refactor hunger and thirst retrieval methods Simplified Framework.GetHunger and Framework.GetThirst functions in both qb-core and qbx_core by using Framework.GetPlayerMetaData instead of accessing player data directly. This improves code readability and consistency. --- modules/framework/qb-core/client.lua | 12 ++++-------- modules/framework/qbx_core/client.lua | 12 ++++-------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/modules/framework/qb-core/client.lua b/modules/framework/qb-core/client.lua index 55a4725..b85410b 100644 --- a/modules/framework/qb-core/client.lua +++ b/modules/framework/qb-core/client.lua @@ -112,19 +112,15 @@ 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 + local hunger = Framework.GetPlayerMetaData("hunger") or 0 + return math.floor((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 + local thirst = Framework.GetPlayerMetaData("thirst") or 0 + return math.floor((thirst) + 0.5) or 0 end ---This will get the players identifier (citizenid) etc. diff --git a/modules/framework/qbx_core/client.lua b/modules/framework/qbx_core/client.lua index 31eb326..5f90b59 100644 --- a/modules/framework/qbx_core/client.lua +++ b/modules/framework/qbx_core/client.lua @@ -71,19 +71,15 @@ 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 + local hunger = Framework.GetPlayerMetaData("hunger") or 0 + return math.floor((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 + local thirst = Framework.GetPlayerMetaData("thirst") or 0 + return math.floor((thirst) + 0.5) or 0 end ---This will get the players identifier (citizenid) etc.