From 075fb087f248267b71d6012cb5f54ff8790fa0c3 Mon Sep 17 00:00:00 2001
From: Andyyy7666 <86536434+Andyyy7666@users.noreply.github.com>
Date: Mon, 16 Mar 2026 05:36:53 +0100
Subject: [PATCH] feat(client/events): event reliablity

---
 client/events.lua | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/client/events.lua b/client/events.lua
index 48ea7c3..4d7769b 100644
--- a/client/events.lua
+++ b/client/events.lua
@@ -4,27 +4,35 @@ end)
 
 -- updates the money on the client.
 RegisterNetEvent("ND:updateMoney", function(cash, bank)
-    if not NDCore.player then return end
+    if source == "" or not NDCore.player then return end
     NDCore.player.cash = cash
     NDCore.player.bank = bank
 end)
 
 -- Sets main character.
 RegisterNetEvent("ND:characterLoaded", function(character)
+    if source == "" then return end
     NDCore.player = character
 end)
 
 -- Update main character info.
 RegisterNetEvent("ND:updateCharacter", function(character)
+    if source == "" or not NDCore.player then return end
     NDCore.player = character
 end)
 
 -- Updates last lcoation.
 RegisterNetEvent("ND:updateLastLocation", function(location)
-    if not NDCore.player then return end
+    if source == "" or not NDCore.player then return end
     NDCore.player.lastLocation = location
 end)
 
+-- Unsets main character.
+RegisterNetEvent("ND:characterUnloaded", function()
+    if source == "" or not NDCore.player then return end
+    NDCore.player = nil
+end)
+
 RegisterNetEvent("ND:revivePlayer", function()
     if source == "" then return end
     local oldPed = cache.ped
@@ -57,8 +65,6 @@ RegisterNetEvent("ND:revivePlayer", function()
     end
 end)
 
-RegisterNetEvent("ND:characterUnloaded")
-
 RegisterNetEvent("ND:clothingMenu", function()
     if GetResourceState("fivem-appearance") ~= "started" then return end