From b03e83933fe77c67c38d0e2b6b3b89c9ef27233e Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Wed, 26 Feb 2025 01:34:47 -0500 Subject: [PATCH] feat(Framework.GetPlayerDob) available now on supported cores near you! --- modules/framework/es_extended/client.lua | 6 +++ modules/framework/es_extended/server.lua | 6 +++ modules/framework/qb-core/client.lua | 6 +++ modules/framework/qb-core/server.lua | 51 +++++++++++++++++------- modules/framework/qbx_core/client.lua | 5 +++ modules/framework/qbx_core/server.lua | 5 +++ 6 files changed, 64 insertions(+), 15 deletions(-) diff --git a/modules/framework/es_extended/client.lua b/modules/framework/es_extended/client.lua index 328530c..e905e97 100644 --- a/modules/framework/es_extended/client.lua +++ b/modules/framework/es_extended/client.lua @@ -12,6 +12,12 @@ Framework.GetPlayerData = function() return ESX.PlayerData end +Framework.GetPlayerDob = function() + local playerData = ESX.GetPlayerData() + local dob = playerData.dateofbirth + return dob +end + Framework.GetPlayerMetaData = function(metadata) return ESX.GetPlayerData().metadata[metadata] end diff --git a/modules/framework/es_extended/server.lua b/modules/framework/es_extended/server.lua index 80394fa..4496eee 100644 --- a/modules/framework/es_extended/server.lua +++ b/modules/framework/es_extended/server.lua @@ -8,6 +8,12 @@ Framework.GetFrameworkName = function() return 'es_extended' end +Framework.GetPlayerDob = function(src) + local xPlayer = ESX.GetPlayerFromId(src) + local dob = xPlayer.get("dateofbirth") + return dob +end + -- Framework.GetPlayerIdentifier(src) -- Returns the citizen ID of the player. Framework.GetPlayerIdentifier = function(src) diff --git a/modules/framework/qb-core/client.lua b/modules/framework/qb-core/client.lua index 727787d..67766e8 100644 --- a/modules/framework/qb-core/client.lua +++ b/modules/framework/qb-core/client.lua @@ -13,6 +13,12 @@ Framework.GetPlayerData = function() return QBCore.Functions.GetPlayerData() end +Framework.GetPlayerDob = function() + local player = QBCore.Functions.GetPlayerData() + local playerData = player.PlayerData + return playerData.charinfo.birthdate +end + Framework.GetPlayerMetaData = function(metadata) return QBCore.Functions.GetPlayerData().metadata[metadata] end diff --git a/modules/framework/qb-core/server.lua b/modules/framework/qb-core/server.lua index 7772e2e..6ea0e5d 100644 --- a/modules/framework/qb-core/server.lua +++ b/modules/framework/qb-core/server.lua @@ -12,21 +12,32 @@ end -- Framework.GetPlayerIdentifier(src) -- Returns the citizen ID of the player. Framework.GetPlayerIdentifier = function(src) - return QBCore.Functions.GetPlayer(src).PlayerData.citizenid + local player = QBCore.Functions.GetPlayer(src) + local playerData = player.PlayerData + return playerData.citizenid end -- Framework.GetPlayerName(src) -- Returns the first and last name of the player. Framework.GetPlayerName = function(src) - local playerData = QBCore.Functions.GetPlayer(src).PlayerData + local player = QBCore.Functions.GetPlayer(src) + local playerData = player.PlayerData return playerData.charinfo.firstname, playerData.charinfo.lastname end +Framework.GetPlayerDob = function(src) + local player = QBCore.Functions.GetPlayer(src) + local playerData = player.PlayerData + return playerData.charinfo.birthdate +end + -- Framework.GetItem(src, item, metadata) -- Returns a table of items matching the specified name and if passed metadata from the player's inventory. -- returns {name = v.name, count = v.amount, metadata = v.info, slot = v.slot} Framework.GetItem = function(src, item, metadata) - local playerInventory = QBCore.Functions.GetPlayer(src).PlayerData.items + local player = QBCore.Functions.GetPlayer(src) + local playerData = player.PlayerData + local playerInventory = playerData.items local repackedTable = {} for _, v in pairs(playerInventory) do if v.name == item and (not metadata or v.info == metadata) then @@ -44,7 +55,9 @@ end -- Framework.GetItemCount(src, item, metadata) -- Returns the count of items matching the specified name and if passed metadata from the player's inventory. Framework.GetItemCount = function(src, item, metadata) - local playerInventory = QBCore.Functions.GetPlayer(src).PlayerData.items + local player = QBCore.Functions.GetPlayer(src) + local playerData = player.PlayerData + local playerInventory = playerData.items local count = 0 for _, v in pairs(playerInventory) do if v.name == item and (not metadata or v.info == metadata) then @@ -58,9 +71,11 @@ end -- Returns the entire inventory of the player as a table. -- returns {name = v.name, count = v.amount, metadata = v.info, slot = v.slot} Framework.GetPlayerInventory = function(src) - local playerItems = QBCore.Functions.GetPlayer(src).PlayerData.items + local player = QBCore.Functions.GetPlayer(src) + local playerData = player.PlayerData + local playerInventory = playerData.items local repackedTable = {} - for _, v in pairs(playerItems) do + for _, v in pairs(playerInventory) do table.insert(repackedTable, { name = v.name, count = v.amount, @@ -72,9 +87,11 @@ Framework.GetPlayerInventory = function(src) end Framework.GetItemBySlot = function(src, slot) - local playerItems = QBCore.Functions.GetPlayer(src).PlayerData.items + local player = QBCore.Functions.GetPlayer(src) + local playerData = player.PlayerData + local playerInventory = playerData.items local repack = {} - for _, v in pairs(playerItems) do + for _, v in pairs(playerInventory) do if v.slot == slot then return { name = v.name, @@ -159,23 +176,26 @@ Framework.GetHunger = function(src) end Framework.GetThirst = function(src) - local player = QBCore.Functions.GetPlayer(src).PlayerData - local newThirst = (player.metadata.thirst or 0) + local player = QBCore.Functions.GetPlayer(src) + local playerData = player.PlayerData + local newThirst = (playerData.metadata.thirst or 0) return newThirst end -- Framework.GetPlayerPhone(src) -- Returns the phone number of the player. Framework.GetPlayerPhone = function(src) - local playerData = QBCore.Functions.GetPlayer(src).PlayerData + local player = QBCore.Functions.GetPlayer(src) + local playerData = player.PlayerData return playerData.charinfo.phone end -- Framework.GetPlayerGang(src) -- Returns the gang name of the player. Framework.GetPlayerGang = function(src) - local player = QBCore.Functions.GetPlayer(src).PlayerData - return player.gang.name + local player = QBCore.Functions.GetPlayer(src) + local playerData = player.PlayerData + return playerData.gang.name end -- Framework.GetPlayersByJob(jobname) @@ -195,8 +215,9 @@ end -- Framework.GetPlayerJob(src) -- Returns the job name, label, grade name, and grade level of the player. Framework.GetPlayerJob = function(src) - local player = QBCore.Functions.GetPlayer(src).PlayerData - return player.job.name, player.job.label, player.job.grade.name, player.job.grade.level + local player = QBCore.Functions.GetPlayer(src) + local playerData = player.PlayerData + return playerData.job.name, playerData.job.label, playerData.job.grade.name, playerData.job.grade.level end -- Framework.SetPlayerJob(src, name, grade) diff --git a/modules/framework/qbx_core/client.lua b/modules/framework/qbx_core/client.lua index f11dcd8..5d17c3f 100644 --- a/modules/framework/qbx_core/client.lua +++ b/modules/framework/qbx_core/client.lua @@ -12,6 +12,11 @@ Framework.GetPlayerData = function() return QBox.GetPlayerData() end +Framework.GetPlayerDob = function() + local playerData = QBox.GetPlayerData() + return playerData.charinfo.birthdate +end + Framework.GetPlayerMetaData = function(metadata) local playerData = QBox.GetPlayerData() return playerData.metadata[metadata] diff --git a/modules/framework/qbx_core/server.lua b/modules/framework/qbx_core/server.lua index 850cc93..7790468 100644 --- a/modules/framework/qbx_core/server.lua +++ b/modules/framework/qbx_core/server.lua @@ -8,6 +8,11 @@ Framework.GetFrameworkName = function() return 'qbx_core' end +Framework.GetPlayerDob = function(src) + local playerData = QBox:GetPlayer(src).PlayerData + return playerData.charinfo.birthdate +end + -- Framework.GetPlayerIdentifier(src) -- Returns the citizen ID of the player. Framework.GetPlayerIdentifier = function(src)