AddEventHandler.... not needed <3

ND_ATMs/source/client.lua

@@ -131,8 +131,7 @@ RegisterNUICallback("useATM", function(data)
 end)
 
 -- update the balance on the ui and confirm if the deposit/withdraw was successful.
-RegisterNetEvent("ND_ATMs:update")
+RegisterNetEvent("ND_ATMs:update", function(status)
-AddEventHandler("ND_ATMs:update", function(status)
     Citizen.Wait(1000)
     local selectedCharacter = NDCore.Functions.GetSelectedCharacter()
     SendNUIMessage({

ND_ATMs/source/server.lua

@@ -1,15 +1,13 @@
 NDCore = exports["ND_Core"]:GetCoreObject()
 NDCore.Functions.VersionChecker("ND_ATMs", GetCurrentResourceName(), "https://github.com/Andyyy7666/ND_Framework", "https://raw.githubusercontent.com/Andyyy7666/ND_Framework/main/ND_ATMs/fxmanifest.lua")
 
-RegisterNetEvent("ND_ATMs:withdraw")
+RegisterNetEvent("ND_ATMs:withdraw", function(amount)
-AddEventHandler("ND_ATMs:withdraw", function(amount)
     local player = source
     local update = NDCore.Functions.WithdrawMoney(amount, player)
     TriggerClientEvent("ND_ATMs:update", player, update)
 end)
 
-RegisterNetEvent("ND_ATMs:deposit")
+RegisterNetEvent("ND_ATMs:deposit", function(amount)
-AddEventHandler("ND_ATMs:deposit", function(amount)
     local player = source
     local update = NDCore.Functions.DepositMoney(amount, player)
     TriggerClientEvent("ND_ATMs:update", player, update)

ND_Banks/source/client.lua

@@ -177,8 +177,7 @@ RegisterNUICallback("useATM", function(data)
 end)
 
 -- update the balance on the ui and confirm if the deposit/withdraw was successful.
-RegisterNetEvent("ND_Banks:update")
+RegisterNetEvent("ND_Banks:update", function(status)
-AddEventHandler("ND_Banks:update", function(status)
     Citizen.Wait(1000)
     local selectedCharacter = NDCore.Functions.GetSelectedCharacter()
     SendNUIMessage({

ND_Banks/source/server.lua

@@ -1,22 +1,19 @@
 NDCore = exports["ND_Core"]:GetCoreObject()
 NDCore.Functions.VersionChecker("ND_Banks", GetCurrentResourceName(), "https://github.com/Andyyy7666/ND_Framework", "https://raw.githubusercontent.com/Andyyy7666/ND_Framework/main/ND_Banks/fxmanifest.lua")
 
-RegisterNetEvent("ND_Banks:withdraw")
+RegisterNetEvent("ND_Banks:withdraw", function(amount)
-AddEventHandler("ND_Banks:withdraw", function(amount)
     local player = source
     local update = NDCore.Functions.WithdrawMoney(amount, player)
     TriggerClientEvent("ND_Banks:update", player, update)
 end)
 
-RegisterNetEvent("ND_Banks:deposit")
+RegisterNetEvent("ND_Banks:deposit", function(amount)
-AddEventHandler("ND_Banks:deposit", function(amount)
     local player = source
     local update = NDCore.Functions.DepositMoney(amount, player)
     TriggerClientEvent("ND_Banks:update", player, update)
 end)
 
-RegisterNetEvent("ND_Banks:transfer")
+RegisterNetEvent("ND_Banks:transfer", function(amount, target)
-AddEventHandler("ND_Banks:transfer", function(amount, target)
     local player = source
     local update = NDCore.Functions.TransferBank(amount, player, target)
     TriggerClientEvent("ND_Banks:update", player, update)

ND_CharacterSelection/source/client.lua

@@ -113,8 +113,7 @@ AddEventHandler("playerSpawned", function()
 end)
 
 -- This is used to add department drop down on the ui.
-RegisterNetEvent("ND_CharacterSelection:permsChecked")
+RegisterNetEvent("ND_CharacterSelection:permsChecked", function(allowedRoles)
-AddEventHandler("ND_CharacterSelection:permsChecked", function(allowedRoles)
     SendNUIMessage({
         type = "givePerms",
         deptRoles = json.encode(allowedRoles)
@@ -122,8 +121,7 @@ AddEventHandler("ND_CharacterSelection:permsChecked", function(allowedRoles)
 end)
 
 -- Gets all the characters and displays them on the ui.
-RegisterNetEvent("ND:returnCharacters")
+RegisterNetEvent("ND:returnCharacters", function(characters)
-AddEventHandler("ND:returnCharacters", function(characters)
     local playerCharacters = {}
     for id, characterInfo in pairs(characters) do
         playerCharacters[tostring(id)] = characterInfo

ND_CharacterSelection/source/server.lua

@@ -19,8 +19,7 @@ function validateDepartment(player, department)
 end
 
 -- Creating a new character.
-RegisterNetEvent("ND_CharacterSelection:newCharacter")
+RegisterNetEvent("ND_CharacterSelection:newCharacter", function(newCharacter)
-AddEventHandler("ND_CharacterSelection:newCharacter", function(newCharacter)
     local player = source
 
     -- validate that the person has permission to use the department.
@@ -32,8 +31,7 @@ AddEventHandler("ND_CharacterSelection:newCharacter", function(newCharacter)
 end)
 
 -- Update the character info when edited.
-RegisterNetEvent("ND_CharacterSelection:editCharacter")
+RegisterNetEvent("ND_CharacterSelection:editCharacter", function(newCharacter)
-AddEventHandler("ND_CharacterSelection:editCharacter", function(newCharacter)
     local player = source
 
     -- validate that the person has permission to use the department.
@@ -47,8 +45,7 @@ AddEventHandler("ND_CharacterSelection:editCharacter", function(newCharacter)
     TriggerClientEvent("ND:returnCharacters", player, NDCore.Functions.GetPlayerCharacters(player))
 end)
 
-RegisterNetEvent("ND_CharacterSelection:checkPerms")
+RegisterNetEvent("ND_CharacterSelection:checkPerms", function()
-AddEventHandler("ND_CharacterSelection:checkPerms", function()
     local player = source
     local discordUserId = NDCore.Functions.GetPlayerIdentifierFromType("discord", player):gsub("discord:", "")
     local allowedRoles = {}

ND_Chat/source/client.lua

@@ -21,8 +21,7 @@ if config["/darkweb"].enabled then
 end
 
 if config["/911"].enabled then
-    RegisterNetEvent("ND_Chat:911")
+    RegisterNetEvent("ND_Chat:911", function(coords, callDescription)
-    AddEventHandler("ND_Chat:911", function(coords, callDescription)
         local selectedCharacter
         NDCore.Functions.GetSelectedCharacter(function(character)
             selectedCharacter = character

ND_Core/client/main.lua

@@ -58,27 +58,23 @@ if config.customPauseMenu then
     end)
 end
 
-RegisterNetEvent("ND:returnCharacters")
+RegisterNetEvent("ND:returnCharacters", function(characters)
-AddEventHandler("ND:returnCharacters", function(characters)
     NDCore.Characters = characters
 end)
 
 -- updates the money on the client.
-RegisterNetEvent("ND:updateMoney")
+RegisterNetEvent("ND:updateMoney", function(cash, bank)
-AddEventHandler("ND:updateMoney", function(cash, bank)
     NDCore.SelectedCharacter.cash = cash
     NDCore.SelectedCharacter.bank = bank
 end)
 
 -- Sets main character.
-RegisterNetEvent("ND:setCharacter")
+RegisterNetEvent("ND:setCharacter", function(character)
-AddEventHandler("ND:setCharacter", function(character)
     NDCore.SelectedCharacter = character
 end)
 
 -- Updates last lcoation.
-RegisterNetEvent("ND:updateLastLocation")
+RegisterNetEvent("ND:updateLastLocation", function(location)
-AddEventHandler("ND:updateLastLocation", function(location)
     NDCore.SelectedCharacter.lastLocation = location
 end)
 

ND_Doorlocks/source/client.lua

@@ -42,8 +42,7 @@ function isAuthorized(door)
     return false
 end
 
-RegisterNetEvent("ND:setCharacter")
+RegisterNetEvent("ND:setCharacter", function(character)
-AddEventHandler("ND:setCharacter", function(character)
     job = character.job
 end)
 
@@ -80,8 +79,7 @@ Citizen.CreateThread(function()
     end
 end)
 
-RegisterNetEvent("ND_Doorlocks:syncDoor")
+RegisterNetEvent("ND_Doorlocks:syncDoor", function(doorID, state)
-AddEventHandler("ND_Doorlocks:syncDoor", function(doorID, state)
     doorList[doorID].locked = state
     for _, doors in pairs(doorList[doorID].doors) do
         local entity = GetClosestObjectOfType(doors.coords.x, doors.coords.y, doors.coords.z, 1.0, doors.hash, false, false, false)
@@ -90,8 +88,7 @@ AddEventHandler("ND_Doorlocks:syncDoor", function(doorID, state)
     end
 end)
 
-RegisterNetEvent("ND_Doorlocks:returnDoors")
+RegisterNetEvent("ND_Doorlocks:returnDoors", function(updatedDoors)
-AddEventHandler("ND_Doorlocks:returnDoors", function(updatedDoors)
     for doorID, state in pairs(updatedDoors) do
         doorList[doorID].locked = state
         for _, doors in pairs(doorList[doorID].doors) do

ND_Doorlocks/source/server.lua

@@ -5,14 +5,12 @@ NDCore.Functions.VersionChecker("ND_Doorlocks", GetCurrentResourceName(), "https
 
 local updatedDoors = {}
 
-RegisterNetEvent("ND_Doorlocks:syncDoor")
+RegisterNetEvent("ND_Doorlocks:syncDoor", function(doorID, state)
-AddEventHandler("ND_Doorlocks:syncDoor", function(doorID, state)
     updatedDoors[doorID] = state
     TriggerClientEvent("ND_Doorlocks:syncDoor", -1, doorID, state)
 end)
 
-RegisterNetEvent("ND_Doorlocks:getDoors")
+RegisterNetEvent("ND_Doorlocks:getDoors", function()
-AddEventHandler("ND_Doorlocks:getDoors", function()
     local player = source
     TriggerClientEvent("ND_Doorlocks:returnDoors", player, updatedDoors)
 end)

ND_Jailing/source/client.lua

@@ -121,8 +121,7 @@ Citizen.CreateThread(function()
 end)
 
 -- Return list of all players on the server and open ui.
-RegisterNetEvent("ND_Jailing:returnPlayers")
+RegisterNetEvent("ND_Jailing:returnPlayers", function(players)
-AddEventHandler("ND_Jailing:returnPlayers", function(players)
     for _, player in pairs(players) do
         SendNUIMessage({
             type = "players",
@@ -159,8 +158,7 @@ function jail(time)
     TriggerServerEvent("ND_Jailing:updateJailing", jailTime)
 end
 
-RegisterNetEvent("ND_Jailing:timeLeft")
+RegisterNetEvent("ND_Jailing:timeLeft", function()
-AddEventHandler("ND_Jailing:timeLeft", function()
     while jailTime > 0 do
         Citizen.Wait(0)
         text("Time until release: " .. tostring(jailTime), 0.5, 0.9, 0.5)
@@ -168,13 +166,11 @@ AddEventHandler("ND_Jailing:timeLeft", function()
 end)
 
 -- Jail a player and loop to keep them in jail every second.
-RegisterNetEvent("ND_Jailing:jailPlayer")
+RegisterNetEvent("ND_Jailing:jailPlayer", function(time)
-AddEventHandler("ND_Jailing:jailPlayer", function(time)
     jail(time)
 end)
 
-RegisterNetEvent("ND_Jailing:unjailPlayer")
+RegisterNetEvent("ND_Jailing:unjailPlayer", function(time)
-AddEventHandler("ND_Jailing:unjailPlayer", function(time)
     jailTime = 0
 end)
 

ND_Jailing/source/server.lua

@@ -32,8 +32,7 @@ function sendToDiscord(name, message, color)
 end
 
 -- Jail player discord log, trigger the even on the players client and send a message to everyone.
-RegisterNetEvent("ND_Jailing:jailPlayer")
+RegisterNetEvent("ND_Jailing:jailPlayer", function(id, time, fine, reason)
-AddEventHandler("ND_Jailing:jailPlayer", function(id, time, fine, reason)
     local player = source
     local players = NDCore.Functions.GetPlayers()
     local dept = players[player].job
@@ -53,8 +52,7 @@ AddEventHandler("ND_Jailing:jailPlayer", function(id, time, fine, reason)
     end
 end)
 
-RegisterNetEvent("ND_Jailing:updateJailing")
+RegisterNetEvent("ND_Jailing:updateJailing", function(time)
-AddEventHandler("ND_Jailing:updateJailing", function(time)
     local player = source
     if time == 0 then
         jailedPlayers[GetPlayerIdentifierFromType("license", player)] = nil
@@ -64,8 +62,7 @@ AddEventHandler("ND_Jailing:updateJailing", function(time)
 end)
 
 -- Gets all players on the server and adds them to a table.
-RegisterNetEvent("ND_Jailing:getPlayers")
+RegisterNetEvent("ND_Jailing:getPlayers", function()
-AddEventHandler("ND_Jailing:getPlayers", function()
     local players = {}
     for _, id in pairs(GetPlayers()) do
         players[id] = "(" .. id .. ") " .. GetPlayerName(id)
@@ -73,8 +70,7 @@ AddEventHandler("ND_Jailing:getPlayers", function()
     TriggerClientEvent("ND_Jailing:returnPlayers", source, players)
 end)
 
-RegisterNetEvent("ND_Jailing:getJailTime")
+RegisterNetEvent("ND_Jailing:getJailTime", function()
-AddEventHandler("ND_Jailing:getJailTime", function()
     local player = source
     local time = jailedPlayers[GetPlayerIdentifierFromType("license", player)]
     if time then

ND_ShotSpotter/source/client.lua

@@ -90,8 +90,7 @@ Citizen.CreateThread(function()
     end
 end)
 
-RegisterNetEvent("ND_ShotSpotter:Report")
+RegisterNetEvent("ND_ShotSpotter:Report", function(street, pedCoords, postal)
-AddEventHandler("ND_ShotSpotter:Report", function(street, pedCoords, postal)
     -- if the player isn't a cop then they won't receive the alert.
     if not isCop() then
         return
@@ -130,8 +129,7 @@ AddEventHandler("ND_ShotSpotter:Report", function(street, pedCoords, postal)
 end)
 
 -- set route to latest shot spotter location.
-RegisterNetEvent("ND_shotSpotter:setRoute")
+RegisterNetEvent("ND_shotSpotter:setRoute", function()
-AddEventHandler("ND_shotSpotter:setRoute", function()
     while setRoute do
         Citizen.Wait(0)
         if IsControlJustPressed(0, 113) then

ND_ShotSpotter/source/server.lua

@@ -3,8 +3,7 @@
 NDCore = exports["ND_Core"]:GetCoreObject()
 NDCore.Functions.VersionChecker("ND_ShotSpotter", GetCurrentResourceName(), "https://github.com/Andyyy7666/ND_Framework", "https://raw.githubusercontent.com/Andyyy7666/ND_Framework/main/ND_ShotSpotter/fxmanifest.lua")
 
-RegisterNetEvent("ND_ShotSpotter:Trigger")
+RegisterNetEvent("ND_ShotSpotter:Trigger", function(street, pedCoords, postal, zoneName)
-AddEventHandler("ND_ShotSpotter:Trigger", function(street, pedCoords, postal, zoneName)
     if server_config.useDiscordLogging then
         local embed = {
             {