From 2cb6531f823bb01f9b97c59c8b22e84409f9c1bb Mon Sep 17 00:00:00 2001 From: Tabby Dev <88893827+Tabby-Labs@users.noreply.github.com> Date: Thu, 22 May 2025 19:17:24 +0800 Subject: [PATCH] refactor(esx_multicharacter/server/modules/functions): use 'esx:playerCrashed' for consistency --- .../server/modules/functions.lua | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/[core]/esx_multicharacter/server/modules/functions.lua b/[core]/esx_multicharacter/server/modules/functions.lua index 6c816571..b46dd43a 100644 --- a/[core]/esx_multicharacter/server/modules/functions.lua +++ b/[core]/esx_multicharacter/server/modules/functions.lua @@ -45,19 +45,17 @@ function Server:OnConnecting(source, deferrals) deferrals.done("[ESX Multicharacter] OxMySQL Was Unable To Connect to your database. Please make sure it is turned on and correctly configured in your server.cfg") end - if identifier then - if not ESX.GetConfig().EnableDebug then - if not source and ESX.Players[identifier] then - deferrals.done(("[ESX Multicharacter] A player is already connected to the server with this identifier.\nYour identifier: %s:%s"):format(Server.identifierType, identifier)) - else - deferrals.done() - end - else - deferrals.done() - end - else - deferrals.done(("[ESX Multicharacter] Unable to retrieve player identifier.\nIdentifier type: %s"):format(Server.identifierType)) - end + if not identifier then return deferrals.done(("[ESX Multicharacter] Unable to retrieve player identifier.\nIdentifier type: %s"):format(Server.identifierType)) end + + if ESX.GetConfig().EnableDebug or not ESX.Players[identifier] then deferrals.done() end + + TriggerEvent('esx:playerCrashed', identifier, function() + ESX.Players[identifier] = nil + deferrals.update(('[ESX] Cleaning old Player entry for [%s] (player invalid)'):format(identifier)) + end) + + deferrals.done() -- proceed end + Server:ResetPlayers()