From 55c346446414994f37a2deabdf49c70a30c9157e Mon Sep 17 00:00:00 2001 From: Fezz <43589668+FBFezz@users.noreply.github.com> Date: Mon, 21 Jul 2025 14:13:37 +0100 Subject: [PATCH 1/6] Player Logout Fix Fixes the error with esx:playerlogout --- [core]/es_extended/server/main.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/[core]/es_extended/server/main.lua b/[core]/es_extended/server/main.lua index abb7e199..cea4bd48 100644 --- a/[core]/es_extended/server/main.lua +++ b/[core]/es_extended/server/main.lua @@ -386,11 +386,16 @@ end) AddEventHandler("esx:playerLogout", function(playerId, cb) local xPlayer = ESX.GetPlayerFromId(playerId) + + if not xPlayer then + return + end + local job = xPlayer.getJob().name Core.JobsPlayerCount[job] = Core.JobsPlayerCount[job] - 1 GlobalState[("%s:count"):format(job)] = Core.JobsPlayerCount[job] - + if xPlayer then TriggerEvent("esx:playerDropped", playerId) From 197f3c1fb3ee20891efded6bd5abb90f5b8d7b8b Mon Sep 17 00:00:00 2001 From: Fezz <43589668+FBFezz@users.noreply.github.com> Date: Mon, 21 Jul 2025 14:18:42 +0100 Subject: [PATCH 2/6] Update main.lua --- [core]/es_extended/server/main.lua | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/[core]/es_extended/server/main.lua b/[core]/es_extended/server/main.lua index cea4bd48..efbe68c8 100644 --- a/[core]/es_extended/server/main.lua +++ b/[core]/es_extended/server/main.lua @@ -396,18 +396,16 @@ AddEventHandler("esx:playerLogout", function(playerId, cb) Core.JobsPlayerCount[job] = Core.JobsPlayerCount[job] - 1 GlobalState[("%s:count"):format(job)] = Core.JobsPlayerCount[job] - if xPlayer then - TriggerEvent("esx:playerDropped", playerId) + TriggerEvent("esx:playerDropped", playerId) - Core.playersByIdentifier[xPlayer.identifier] = nil - Core.SavePlayer(xPlayer, function() - GlobalState["playerCount"] = GlobalState["playerCount"] - 1 - ESX.Players[playerId] = nil - if cb then - cb() - end - end) - end + Core.playersByIdentifier[xPlayer.identifier] = nil + Core.SavePlayer(xPlayer, function() + GlobalState["playerCount"] = GlobalState["playerCount"] - 1 + ESX.Players[playerId] = nil + if cb then + cb() + end + end) TriggerClientEvent("esx:onPlayerLogout", playerId) end) From 98610a6117d0f04a7dbcf15f6768d02e41d8b9f1 Mon Sep 17 00:00:00 2001 From: Fezz <43589668+FBFezz@users.noreply.github.com> Date: Mon, 21 Jul 2025 14:37:25 +0100 Subject: [PATCH 3/6] Update main.lua --- [core]/es_extended/server/main.lua | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/[core]/es_extended/server/main.lua b/[core]/es_extended/server/main.lua index efbe68c8..d9d5f42d 100644 --- a/[core]/es_extended/server/main.lua +++ b/[core]/es_extended/server/main.lua @@ -391,21 +391,7 @@ AddEventHandler("esx:playerLogout", function(playerId, cb) return end - local job = xPlayer.getJob().name - - Core.JobsPlayerCount[job] = Core.JobsPlayerCount[job] - 1 - GlobalState[("%s:count"):format(job)] = Core.JobsPlayerCount[job] - - TriggerEvent("esx:playerDropped", playerId) - - Core.playersByIdentifier[xPlayer.identifier] = nil - Core.SavePlayer(xPlayer, function() - GlobalState["playerCount"] = GlobalState["playerCount"] - 1 - ESX.Players[playerId] = nil - if cb then - cb() - end - end) + onPlayerDropped(xPlayer.source, "esx_stale_player_obj") TriggerClientEvent("esx:onPlayerLogout", playerId) end) From 6198cd23b0a941783aec477b293710dcc4601de4 Mon Sep 17 00:00:00 2001 From: Fezz <43589668+FBFezz@users.noreply.github.com> Date: Mon, 21 Jul 2025 22:01:27 +0100 Subject: [PATCH 4/6] Update main.lua --- [core]/es_extended/server/main.lua | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/[core]/es_extended/server/main.lua b/[core]/es_extended/server/main.lua index d9d5f42d..ef686d2a 100644 --- a/[core]/es_extended/server/main.lua +++ b/[core]/es_extended/server/main.lua @@ -387,11 +387,7 @@ end) AddEventHandler("esx:playerLogout", function(playerId, cb) local xPlayer = ESX.GetPlayerFromId(playerId) - if not xPlayer then - return - end - - onPlayerDropped(xPlayer.source, "esx_stale_player_obj") + onPlayerDropped(xPlayer.source, "esx_player_logout") TriggerClientEvent("esx:onPlayerLogout", playerId) end) From 1225c081072c90c83026ba1343bf8d54d48c4bd6 Mon Sep 17 00:00:00 2001 From: Fezz <43589668+FBFezz@users.noreply.github.com> Date: Tue, 22 Jul 2025 12:19:02 +0100 Subject: [PATCH 5/6] Update main.lua --- [core]/es_extended/server/main.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/[core]/es_extended/server/main.lua b/[core]/es_extended/server/main.lua index ef686d2a..b31dd127 100644 --- a/[core]/es_extended/server/main.lua +++ b/[core]/es_extended/server/main.lua @@ -385,8 +385,6 @@ AddEventHandler("esx:setJob", function(_, job, lastJob) end) AddEventHandler("esx:playerLogout", function(playerId, cb) - local xPlayer = ESX.GetPlayerFromId(playerId) - onPlayerDropped(xPlayer.source, "esx_player_logout") TriggerClientEvent("esx:onPlayerLogout", playerId) end) From 2200bb9e1c02da2415bfc382b060612f24590714 Mon Sep 17 00:00:00 2001 From: Fezz <43589668+FBFezz@users.noreply.github.com> Date: Tue, 22 Jul 2025 12:28:35 +0100 Subject: [PATCH 6/6] Update main.lua --- [core]/es_extended/server/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[core]/es_extended/server/main.lua b/[core]/es_extended/server/main.lua index b31dd127..1c927adc 100644 --- a/[core]/es_extended/server/main.lua +++ b/[core]/es_extended/server/main.lua @@ -385,7 +385,7 @@ AddEventHandler("esx:setJob", function(_, job, lastJob) end) AddEventHandler("esx:playerLogout", function(playerId, cb) - onPlayerDropped(xPlayer.source, "esx_player_logout") + onPlayerDropped(playerId, "esx_player_logout") TriggerClientEvent("esx:onPlayerLogout", playerId) end)