From 1fb6037aad7f95bc85beb4182771e25d6a59e5d5 Mon Sep 17 00:00:00 2001 From: Ilias Rbayti <63159154+Kenshiin13@users.noreply.github.com> Date: Sun, 17 Nov 2024 21:47:33 +0100 Subject: [PATCH 1/6] fix(es_extended/client/main): use RegisterNetEvent for esx:playerLoaded --- [core]/es_extended/client/main.lua | 2 +- [core]/esx_skin/client/main.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua index 25a79182..b989857f 100644 --- a/[core]/es_extended/client/main.lua +++ b/[core]/es_extended/client/main.lua @@ -14,7 +14,7 @@ local function ApplyMetadata(metadata) end end -ESX.SecureNetEvent("esx:playerLoaded", function(xPlayer, _, skin) +RegisterNetEvent("esx:playerLoaded", function(xPlayer, _, skin) ESX.PlayerData = xPlayer if not Config.Multichar then diff --git a/[core]/esx_skin/client/main.lua b/[core]/esx_skin/client/main.lua index 7240ae83..f30c86bc 100644 --- a/[core]/esx_skin/client/main.lua +++ b/[core]/esx_skin/client/main.lua @@ -70,7 +70,7 @@ AddEventHandler("esx_skin:playerRegistered", function() end) end) -ESX.SecureNetEvent("esx:playerLoaded", function(_, _, skin) +RegisterNetEvent("esx:playerLoaded", function(_, _, skin) ESX.PlayerLoaded = true TriggerServerEvent("esx_skin:setWeight", skin) end) From 56cd03c68a429561a27cd3eda95b5fba7042f3c8 Mon Sep 17 00:00:00 2001 From: Ilias Rbayti <63159154+Kenshiin13@users.noreply.github.com> Date: Sun, 17 Nov 2024 21:47:43 +0100 Subject: [PATCH 2/6] fix(es_extended/client/modules/npwd): use RegisterNetEvent for esx:playerLoaded --- [core]/es_extended/client/modules/npwd.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[core]/es_extended/client/modules/npwd.lua b/[core]/es_extended/client/modules/npwd.lua index 98ff92e6..a1aa73a8 100644 --- a/[core]/es_extended/client/modules/npwd.lua +++ b/[core]/es_extended/client/modules/npwd.lua @@ -9,7 +9,7 @@ local function checkPhone() npwd:setPhoneDisabled((phoneItem and phoneItem.count or 0) <= 0) end -ESX.SecureNetEvent("esx:playerLoaded", checkPhone) +RegisterNetEvent("esx:playerLoaded", checkPhone) AddEventHandler("onClientResourceStart", function(resource) if resource ~= "npwd" then From 9446d73e9b041df6d657ce7fab275e59dac25ac1 Mon Sep 17 00:00:00 2001 From: Ilias Rbayti <63159154+Kenshiin13@users.noreply.github.com> Date: Sun, 17 Nov 2024 21:56:05 +0100 Subject: [PATCH 3/6] fix(esx_multicharacter/client/main): use RegisterNetEvent for esx:playerLoaded --- [core]/esx_multicharacter/client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[core]/esx_multicharacter/client/main.lua b/[core]/esx_multicharacter/client/main.lua index 33568bc6..0e6da55c 100644 --- a/[core]/esx_multicharacter/client/main.lua +++ b/[core]/esx_multicharacter/client/main.lua @@ -33,7 +33,7 @@ ESX.SecureNetEvent("esx_multicharacter:SetupUI", function(data, slots) Multicharacter:SetupUI(data, slots) end) -ESX.SecureNetEvent('esx:playerLoaded', function(playerData, isNew, skin) +RegisterNetEvent('esx:playerLoaded', function(playerData, isNew, skin) Multicharacter:PlayerLoaded(playerData, isNew, skin) end) From 5d59b2d94d4f1011692fd3dc5d740392f433e833 Mon Sep 17 00:00:00 2001 From: Ilias Rbayti <63159154+Kenshiin13@users.noreply.github.com> Date: Sun, 17 Nov 2024 21:56:14 +0100 Subject: [PATCH 4/6] refactor(es_extended/server/main): use esx:playerLoaded:internal --- [core]/es_extended/imports.lua | 4 +++- [core]/es_extended/server/main.lua | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[core]/es_extended/imports.lua b/[core]/es_extended/imports.lua index f1483d0a..9069aac3 100644 --- a/[core]/es_extended/imports.lua +++ b/[core]/es_extended/imports.lua @@ -12,9 +12,11 @@ if not IsDuplicityVersion() then -- Only register this event for the client end end) - ESX.SecureNetEvent("esx:playerLoaded", function(xPlayer) + ESX.SecureNetEvent("esx:playerLoaded:internal", function(xPlayer, isNew, playerSkin) ESX.PlayerData = xPlayer ESX.PlayerLoaded = true + + TriggerEvent("esx:playerLoaded", xPlayer, isNew, playerSkin) end) ESX.SecureNetEvent("esx:onPlayerLogout", function() diff --git a/[core]/es_extended/server/main.lua b/[core]/es_extended/server/main.lua index 61fbe78e..cc1a6a95 100644 --- a/[core]/es_extended/server/main.lua +++ b/[core]/es_extended/server/main.lua @@ -290,7 +290,7 @@ function loadESXPlayer(identifier, playerId, isNew) TriggerEvent("esx:playerLoaded", playerId, xPlayer, isNew) userData.money = xPlayer.getMoney() userData.maxWeight = xPlayer.getMaxWeight() - xPlayer.triggerEvent("esx:playerLoaded", userData, isNew, userData.skin) + xPlayer.triggerEvent("esx:playerLoaded:internal", userData, isNew, userData.skin) if not Config.CustomInventory then xPlayer.triggerEvent("esx:createMissingPickups", Core.Pickups) From 6aa49369a12463927a10db0502ca32d6e857ca24 Mon Sep 17 00:00:00 2001 From: Ilias Rbayti <63159154+Kenshiin13@users.noreply.github.com> Date: Sun, 17 Nov 2024 22:48:04 +0100 Subject: [PATCH 5/6] Revert "refactor(es_extended/server/main): use esx:playerLoaded:internal" This reverts commit 5d59b2d94d4f1011692fd3dc5d740392f433e833. --- [core]/es_extended/imports.lua | 4 +--- [core]/es_extended/server/main.lua | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[core]/es_extended/imports.lua b/[core]/es_extended/imports.lua index 9069aac3..f1483d0a 100644 --- a/[core]/es_extended/imports.lua +++ b/[core]/es_extended/imports.lua @@ -12,11 +12,9 @@ if not IsDuplicityVersion() then -- Only register this event for the client end end) - ESX.SecureNetEvent("esx:playerLoaded:internal", function(xPlayer, isNew, playerSkin) + ESX.SecureNetEvent("esx:playerLoaded", function(xPlayer) ESX.PlayerData = xPlayer ESX.PlayerLoaded = true - - TriggerEvent("esx:playerLoaded", xPlayer, isNew, playerSkin) end) ESX.SecureNetEvent("esx:onPlayerLogout", function() diff --git a/[core]/es_extended/server/main.lua b/[core]/es_extended/server/main.lua index cc1a6a95..61fbe78e 100644 --- a/[core]/es_extended/server/main.lua +++ b/[core]/es_extended/server/main.lua @@ -290,7 +290,7 @@ function loadESXPlayer(identifier, playerId, isNew) TriggerEvent("esx:playerLoaded", playerId, xPlayer, isNew) userData.money = xPlayer.getMoney() userData.maxWeight = xPlayer.getMaxWeight() - xPlayer.triggerEvent("esx:playerLoaded:internal", userData, isNew, userData.skin) + xPlayer.triggerEvent("esx:playerLoaded", userData, isNew, userData.skin) if not Config.CustomInventory then xPlayer.triggerEvent("esx:createMissingPickups", Core.Pickups) From 37aaae629622ca35ebe27a3a6018e9c332a84931 Mon Sep 17 00:00:00 2001 From: Ilias Rbayti <63159154+Kenshiin13@users.noreply.github.com> Date: Sun, 17 Nov 2024 22:49:25 +0100 Subject: [PATCH 6/6] fix(es_extended/imports): use RegisterNetEvent for esx:playerLoaded --- [core]/es_extended/imports.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[core]/es_extended/imports.lua b/[core]/es_extended/imports.lua index f1483d0a..d6eb1449 100644 --- a/[core]/es_extended/imports.lua +++ b/[core]/es_extended/imports.lua @@ -12,7 +12,7 @@ if not IsDuplicityVersion() then -- Only register this event for the client end end) - ESX.SecureNetEvent("esx:playerLoaded", function(xPlayer) + RegisterNetEvent("esx:playerLoaded", function(xPlayer) ESX.PlayerData = xPlayer ESX.PlayerLoaded = true end)