From 734a6cdc814aef9f33d189e46c67e970dae9d9f3 Mon Sep 17 00:00:00 2001
From: Linden <65407488+thelindat@users.noreply.github.com>
Date: Sun, 29 May 2022 10:31:43 +1000
Subject: [PATCH] refactor(getCore/client): instantiate player

Previously handled by the player module.
---
 imports/getCore/es_extended/client.lua | 15 +++++++++++++--
 imports/getCore/qb-core/client.lua     | 15 +++++++++++++--
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/imports/getCore/es_extended/client.lua b/imports/getCore/es_extended/client.lua
index b086c5f..7134759 100644
--- a/imports/getCore/es_extended/client.lua
+++ b/imports/getCore/es_extended/client.lua
@@ -11,7 +11,16 @@ return function(resource)
 		ESX.PlayerData.job = job
 	end)
 
-	lib.addPlayerMethod('hasGroup', function(_, filter)
+	local CPlayer = lib.getPlayer()
+
+	function lib.getPlayer()
+		return setmetatable({
+			id = cache.playerId,
+			serverId = cache.serverId,
+		}, CPlayer)
+	end
+
+	function CPlayer:hasGroup(filter)
 		local data = ESX.PlayerData
 		local type = type(filter)
 
@@ -36,7 +45,9 @@ return function(resource)
 				end
 			end
 		end
-	end)
+	end
+
+	player = lib.getPlayer()
 
 	return ESX
 end
diff --git a/imports/getCore/qb-core/client.lua b/imports/getCore/qb-core/client.lua
index b6151b6..c06e3d5 100644
--- a/imports/getCore/qb-core/client.lua
+++ b/imports/getCore/qb-core/client.lua
@@ -16,9 +16,18 @@ return function(resource)
 		PlayerData.gang = gang
 	end)
 
+	local CPlayer = lib.getPlayer()
+
+	function lib.getPlayer()
+		return setmetatable({
+			id = cache.playerId,
+			serverId = cache.serverId,
+		}, CPlayer)
+	end
+
 	local groups = { 'job', 'gang' }
 
-	lib.addPlayerMethod('hasGroup', function(_, filter)
+	function CPlayer:hasGroup(filter)
 		local type = type(filter)
 
 		if type == 'string' then
@@ -55,7 +64,9 @@ return function(resource)
 				end
 			end
 		end
-	end)
+	end
+
+	player = lib.getPlayer()
 
 	return QBCore
 end