From 7b84a02ef2862b401695ff69858d9cc1ce43ad32 Mon Sep 17 00:00:00 2001
From: Tabby Dev <88893827+Tabby-Labs@users.noreply.github.com>
Date: Tue, 20 May 2025 10:07:21 +0800
Subject: [PATCH] fix(es_extended/server/main): fix failed to reconnect after
 client crashed

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

diff --git a/[core]/es_extended/server/main.lua b/[core]/es_extended/server/main.lua
index fe0821a0..993e99ec 100644
--- a/[core]/es_extended/server/main.lua
+++ b/[core]/es_extended/server/main.lua
@@ -50,7 +50,7 @@ local function onPlayerJoined(playerId)
         return DropPlayer(playerId, "there was an error loading your character!\nError code: identifier-missing-ingame\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
 
-    if ESX.GetPlayerFromIdentifier(identifier) then
+    if not playerId and ESX.GetPlayerFromIdentifier(identifier) then
         DropPlayer(
             playerId,
             ("there was an error loading your character!\nError code: identifier-active-ingame\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 Rockstar account.\n\nYour Rockstar identifier: %s"):format(
@@ -116,7 +116,7 @@ if not Config.Multichar then
         end
 
         if identifier then
-            if ESX.GetPlayerFromIdentifier(identifier) then
+            if not playerId and ESX.GetPlayerFromIdentifier(identifier) then
                 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)
                 )