From 74e6a679e258311fb46816c2634332e6b074c866 Mon Sep 17 00:00:00 2001
From: Jim Shield <gothicjim@gmail.com>
Date: Fri, 20 Jun 2025 21:32:08 +0100
Subject: [PATCH] Tidy up onPlayerLoaded for all frameworks

---
 shared/_loaders.lua | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/shared/_loaders.lua b/shared/_loaders.lua
index 010e7cc..d367c0a 100644
--- a/shared/_loaders.lua
+++ b/shared/_loaders.lua
@@ -47,22 +47,21 @@ function onPlayerLoaded(func, onStart)
 
         if isStarted(QBExport) or isStarted(QBXExport) then
             onPlayerFramework = QBExport
-            AddEventHandler('QBCore:Client:OnPlayerLoaded', tempFunc)
+            RegisterNetEvent('QBCore:Client:OnPlayerLoaded', tempFunc)
         elseif isStarted(ESXExport) then
             onPlayerFramework = ESXExport
-            AddEventHandler('esx:playerLoaded', function()
+            RegisterNetEvent('esx:playerLoaded', function()
                 if waitForSharedLoad() then
-                    if isStarted(ESXExport) then Wait(1000) end
                     tempFunc()
                 end
             end
         )
         elseif isStarted(OXCoreExport) then
             onPlayerFramework = OXCoreExport
-            AddEventHandler('ox:playerLoaded', tempFunc)
+            RegisterNetEvent('ox:playerLoaded', tempFunc)
         elseif isStarted(RSGExport) then
             onPlayerFramework = RSGExport
-            AddEventHandler('RSGCore:Client:OnPlayerLoaded', tempFunc)
+            RegisterNetEvent('RSGCore:Client:OnPlayerLoaded', tempFunc)
         end
 
         if onPlayerFramework ~= "" then
@@ -84,10 +83,10 @@ end
 --- ```
 function onPlayerUnload(func)
     RegisterNetEvent('QBCore:Client:OnPlayerUnload', function() func() end)
-    AddEventHandler('ox:playerLogout', function() func() end)
-    AddEventHandler('RSGCore:Client:OnPlayerUnload', function() func() end)
+    RegisterNetEvent('ox:playerLogout', function() func() end)
+    RegisterNetEvent('RSGCore:Client:OnPlayerUnload', function() func() end)
 
-    --AddEventHandler('esx:playerLogout', function() func() end)
+    RegisterNetEvent('esx:onPlayerLogout', function() func() end)
     -- ^ Only server side for now, need a way to send it to client if not already available
 end