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] 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