From 2599d2ed806001f3e01c630f07fd89a3464ef367 Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Sun, 29 May 2022 10:33:34 +1000 Subject: [PATCH] feat(getCore/server): initialise player module and add getter --- imports/getCore/es_extended/server.lua | 15 +++++++++++++++ imports/getCore/qb-core/server.lua | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/imports/getCore/es_extended/server.lua b/imports/getCore/es_extended/server.lua index e905fc8..d389c38 100644 --- a/imports/getCore/es_extended/server.lua +++ b/imports/getCore/es_extended/server.lua @@ -1,5 +1,20 @@ +if not lib.player then lib.player() end + return function(resource) local ESX = exports[resource]:getSharedObject() -- Eventually add some functions here to simplify the creation of framework-agnostic resources. + + local CPlayer = lib.getPlayer() + + function lib.getPlayer(player) + player = type(player) == 'table' and player.playerId or ESX.GetPlayerFromId(player) + + if not player then + error(("'%s' is not a valid player"):format(player)) + end + + return setmetatable(player, CPlayer) + end + return ESX end diff --git a/imports/getCore/qb-core/server.lua b/imports/getCore/qb-core/server.lua index 31810eb..c55ed91 100644 --- a/imports/getCore/qb-core/server.lua +++ b/imports/getCore/qb-core/server.lua @@ -1,5 +1,20 @@ +if not lib.player then lib.player() end + return function(resource) local QBCore = exports[resource]:GetCoreObject() -- Eventually add some functions here to simplify the creation of framework-agnostic resources. + + local CPlayer = lib.getPlayer() + + function lib.getPlayer(player) + player = type(player) == 'table' and player.playerId or QBCore.Functions.GetPlayer(player) + + if not player then + error(("'%s' is not a valid player"):format(player)) + end + + return setmetatable(player, CPlayer) + end + return QBCore end