From 1ab7765cff71a864eeaf637a2bc86c1f3af5ce2a Mon Sep 17 00:00:00 2001
From: Andyyy7666 <86536434+Andyyy7666@users.noreply.github.com>
Date: Thu, 13 Jul 2023 01:22:24 +0200
Subject: [PATCH] update: events and checks

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

diff --git a/client/events.lua b/client/events.lua
index 8ae1397..bf60e7d 100644
--- a/client/events.lua
+++ b/client/events.lua
@@ -1,21 +1,30 @@
-RegisterNetEvent("ND:returnCharacters", function(characters)
-    NDCore.Characters = characters
-end)
-
 -- updates the money on the client.
 RegisterNetEvent("ND:updateMoney", function(cash, bank)
+    if not NDCore.player then return end
     NDCore.player.cash = cash
     NDCore.player.bank = bank
 end)
 
+local function removeCharacterFunctions(character)
+    local newData = {}
+    for k, v in pairs(character) do
+        if type(v) ~= "function" then
+            newData[k] = v
+        end
+    end
+    return newData
+end
+
 -- Sets main character.
-RegisterNetEvent("ND:setCharacter", function(character)
-    NDCore.player = character
+RegisterNetEvent("ND:characterLoaded", function(character)
+    if not NDCore.player then return end
+    NDCore.player = removeCharacterFunctions(character)
 end)
 
 -- Update main character info.
 RegisterNetEvent("ND:updateCharacter", function(character)
-    NDCore.player = character
+    if not NDCore.player then return end
+    NDCore.player = removeCharacterFunctions(character)
 end)
 
 -- Updates last lcoation.
@@ -23,10 +32,3 @@ RegisterNetEvent("ND:updateLastLocation", function(location)
     if not NDCore.player then return end
     NDCore.player.lastLocation = location
 end)
-
--- Enable pvp for players.
-AddEventHandler("playerSpawned", function()
-    print("^0ND Framework support discord: ^5https://discord.gg/Z9Mxu72zZ6")
-    SetCanAttackFriendly(PlayerPedId(), true, false)
-    NetworkSetFriendlyFireOption(true)
-end)