From ebc22cc8e1f7d46cdab53a6e8c5e667f34eb34f7 Mon Sep 17 00:00:00 2001
From: Gellipapa <gellerthorvath0@gmail.com>
Date: Mon, 4 Sep 2023 22:45:51 +0200
Subject: [PATCH 1/3] :rotating_light: Revert players command to old method

---
 [core]/es_extended/server/commands.lua | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/[core]/es_extended/server/commands.lua b/[core]/es_extended/server/commands.lua
index 572794aa..69817266 100644
--- a/[core]/es_extended/server/commands.lua
+++ b/[core]/es_extended/server/commands.lua
@@ -575,10 +575,9 @@ end, false)
 
 ESX.RegisterCommand('players', "admin", function()
     local xPlayers = ESX.GetExtendedPlayers() -- Returns all xPlayers
-    local count = 0 
-    for _, xPlayer in pairs(xPlayers) do
-        count += 1 
+	print(('^5%s^2 online player(s)^0'):format(#xPlayers))
+    for i = 1, #(xPlayers) do
+		local xPlayer = xPlayers[i]
         print(('^1[^2ID: ^5%s^0 | ^2Name : ^5%s^0 | ^2Group : ^5%s^0 | ^2Identifier : ^5%s^1]^0\n'):format(xPlayer.source, xPlayer.getName(), xPlayer.getGroup(), xPlayer.identifier))     
-    end 
-    print(('^5%s^2 online player(s)^0'):format(count))
+    end
 end, true)

From 275a1d16a3625b901c4c14e55b644c88e06841cc Mon Sep 17 00:00:00 2001
From: Gellipapa <gellerthorvath0@gmail.com>
Date: Mon, 4 Sep 2023 22:46:23 +0200
Subject: [PATCH 2/3] :rotating_light: Solving backward compatibility

---
 [core]/es_extended/server/functions.lua | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/[core]/es_extended/server/functions.lua b/[core]/es_extended/server/functions.lua
index 91586005..3e60ac9b 100644
--- a/[core]/es_extended/server/functions.lua
+++ b/[core]/es_extended/server/functions.lua
@@ -256,8 +256,6 @@ local function checkTable(key, val, player, xPlayers)
 end
 
 function ESX.GetExtendedPlayers(key, val)
-	if not key then return ESX.Players end
-
 	local xPlayers = {}
 	if type(val) == "table" then
 		for _, v in pairs(ESX.Players) do
@@ -265,7 +263,11 @@ function ESX.GetExtendedPlayers(key, val)
 		end
 	else
 		for _, v in pairs(ESX.Players) do
-			if (key == 'job' and v.job.name == val) or v[key] == val then
+			if key then
+				if (key == 'job' and v.job.name == val) or v[key] == val then
+					xPlayers[#xPlayers + 1] = v
+				end
+			else
 				xPlayers[#xPlayers + 1] = v
 			end
 		end

From 6b475400eac3e8c7bab766d72cf9cbf1ef87f9ca Mon Sep 17 00:00:00 2001
From: Gellipapa <gellerthorvath0@gmail.com>
Date: Sun, 17 Sep 2023 16:59:50 +0200
Subject: [PATCH 3/3] :wrench: Fix vehicle event throw warning message

---
 [core]/es_extended/client/modules/actions.lua | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/[core]/es_extended/client/modules/actions.lua b/[core]/es_extended/client/modules/actions.lua
index 9150f005..2e4e0e67 100644
--- a/[core]/es_extended/client/modules/actions.lua
+++ b/[core]/es_extended/client/modules/actions.lua
@@ -15,7 +15,10 @@ local function GetData(vehicle)
     end
     local model = GetEntityModel(vehicle)
     local displayName = GetDisplayNameFromVehicleModel(model)
-    local netId = VehToNet(vehicle)
+    local netId = vehicle
+    if NetworkGetEntityIsNetworked(vehicle) then
+        netId = VehToNet(vehicle)
+    end
     return displayName, netId
 end