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