From 0ece059c1934b377e050cd760ef9437b8467bd9f Mon Sep 17 00:00:00 2001
From: Tabby Dev <88893827+Tabby-Labs@users.noreply.github.com>
Date: Wed, 21 May 2025 13:48:26 +0800
Subject: [PATCH] fix(es_extended/server/main): add fallback check if player is
 exist

---
 [core]/es_extended/server/main.lua | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/[core]/es_extended/server/main.lua b/[core]/es_extended/server/main.lua
index b54450bb..a276dafc 100644
--- a/[core]/es_extended/server/main.lua
+++ b/[core]/es_extended/server/main.lua
@@ -119,19 +119,23 @@ if not Config.Multichar then
             return deferrals.done("[ESX] There was an error loading your character!\nError code: identifier-missing\n\nThe cause of this error is not known, your identifier could not be found. Please come back later or report this problem to the server administration team.")
         end
 
-        local xIdentifier = ESX.GetPlayerFromIdentifier(identifier)
+        local xPlayer = ESX.GetPlayerFromIdentifier(identifier)
 
-        if not playerId and xIdentifier then
-            local xId = xIdentifier.playerId
+        if xPlayer then
+            local xPlayerId = xPlayer.playerId
 
-            if ESX.Players[xId] then
-                ESX.Players[xId] = nil
-                Core.playersByIdentifier[identifier] = nil
-                print(("[ESX] Cleaning old ESX.Players entry for %s (ped invalid)"):format(identifier))
-            else
-                return deferrals.done(
-                    ("[ESX] There was an error loading your character!\nError code: identifier-active\n\nThis error is caused by a player on this server who has the same identifier as you have. Make sure you are not playing on the same account.\n\nYour identifier: %s"):format(identifier)
-                )
+            if ESX.Players[xPlayerId] then
+                local xPlayerExist = DoesPlayerExist(xPlayerId --[[@as string]])
+
+                if xPlayerExist ~= 0 then
+                    ESX.Players[xPlayerId] = nil
+                    Core.playersByIdentifier[identifier] = nil
+                    deferrals.update(("[ESX] Cleaning old Player entry for [%s] (player invalid)"):format(identifier))
+                else
+                    return deferrals.done(
+                        ("[ESX] There was an error loading your character!\nError code: identifier-active\n\nThis error is caused by a player on this server who has the same identifier as you have. Make sure you are not playing on the same account.\n\nYour identifier: %s"):format(identifier)
+                    )
+                end
             end
         end