From 85881a4fde0e2244dba0dc1d622b9f4faee7e809 Mon Sep 17 00:00:00 2001 From: Kenshin13 <63159154+Kenshiin13@users.noreply.github.com> Date: Sat, 14 Jun 2025 20:40:27 +0200 Subject: [PATCH] refactor(es_extended/server/main): early return --- [core]/es_extended/server/main.lua | 33 +++++++++++++++--------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/[core]/es_extended/server/main.lua b/[core]/es_extended/server/main.lua index c24b03f2..2f6be680 100644 --- a/[core]/es_extended/server/main.lua +++ b/[core]/es_extended/server/main.lua @@ -121,24 +121,25 @@ if not Config.Multichar then local xPlayer = ESX.GetPlayerFromIdentifier(identifier) - if xPlayer then - local xPlayerId = xPlayer.playerId - local isExist = DoesPlayerExist(xPlayerId --[[@as string]]) - - if isExist ~= 0 then - deferrals.update(("[ESX] Cleaning old Player entry for [%s] (player invalid)"):format(identifier)) - TriggerEvent('esx:playerDropped', xPlayerId) - ESX.Players[xPlayerId] = nil - Core.playersByIdentifier[identifier] = nil - GlobalState['playerCount'] = GlobalState['playerCount'] - 1 - 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 + if not xPlayer then + return deferrals.done() + end + + local xPlayerId = xPlayer.playerId + local isExist = DoesPlayerExist(xPlayerId --[[@as string]]) + + if isExist ~= 0 then + deferrals.update(("[ESX] Cleaning old Player entry for [%s] (player invalid)"):format(identifier)) + TriggerEvent('esx:playerDropped', xPlayerId) + ESX.Players[xPlayerId] = nil + Core.playersByIdentifier[identifier] = nil + GlobalState['playerCount'] = GlobalState['playerCount'] - 1 + 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 - return deferrals.done() end) end