Merge pull request #57 from ND-Framework/fix/driving-locked-vehicle

fix(client/vehicle): vehicle keys issues

README.md

@@ -16,9 +16,13 @@
 * [oxmysql](https://github.com/overextended/oxmysql/releases)
 * [ox_lib](https://github.com/overextended/ox_lib/releases)
 
-## v2 Addons
-* [Character selection](https://github.com/ND-Framework/ND_Characters/tree/wip-v2)
-* [Banking](https://github.com/ND-Framework/ND_Banking/tree/wip-v2)
-* [Appearance shops](https://github.com/ND-Framework/ND_AppearanceShops/tree/wip-v2)
-* [Dealership](https://github.com/ND-Framework/ND_Dealership/tree/v2)
-* [Inventory](https://github.com/overextended/ox_inventory/pull/1403)
+## Addons
+* [Character selection](https://github.com/ND-Framework/ND_Characters/releases)
+* [Banking](https://github.com/ND-Framework/ND_Banking/releases)
+* [Appearance shops](https://github.com/ND-Framework/ND_AppearanceShops/releases)
+* [Dealership](https://github.com/ND-Framework/ND_Dealership/releases)
+* [Inventory](https://github.com/overextended/ox_inventory/releases)
+* [Ambulance job](https://github.com/ND-Framework/ND_Ambulance/releases)
+* [Casino](https://github.com/ND-Framework/ND_Casino/releases)
+* [Blackjack](https://github.com/ND-Framework/ND_Blackjack/releases)
+* [Nitro](https://github.com/ND-Framework/ND_Nitro/releases)

client/death.lua

@@ -29,7 +29,7 @@ AddEventHandler("gameEventTriggered", function(name, args)
 	local victim = args[1]
 	if not IsPedAPlayer(victim) or NetworkGetPlayerIndexFromPed(victim) ~= cache.playerId then return end
 
-    if not IsPedDeadOrDying(victim, true) and GetEntityHealth(victim) > 0 then
+    if not IsPedDeadOrDying(victim, true) then
         local hit, bone = GetPedLastDamageBone(victim)
         if hit and usingAmbulance then
             local damageWeapon = ambulance:getLastDamagingWeapon(victim)

client/functions.lua

@@ -26,6 +26,13 @@ function NDCore.getPlayersFromCoords(distance, coords)
     return closePlayers
 end
 
+function NDCore.getConfig(info)
+    if not info then
+        return Config
+    end
+    return Config[info]
+end
+
 function NDCore.revivePlayer(reset, keepDead)
     local usingAmbulance = GetResourceState("ND_Ambulance") == "started"
     if not keepDead then

client/main.lua

@@ -10,8 +10,9 @@ Config = {
     discordActionLink = GetConvar("discordActionLink", "https://discord.gg/Z9Mxu72zZ6"),
     discordActionText2 = GetConvar("core:discordActionText2", "STORE"),
     discordActionLink2 = GetConvar("core:discordActionLink2", "https://andyyy.tebex.io/category/fivem-scripts"),
-    randomUnlockedVehicleChance = GetConvarInt("core:randomUnlockedVehicleChance", 30),
     disableVehicleAirControl = GetConvarInt("core:disableVehicleAirControl", 1) == 1,
+    randomUnlockedVehicleChance = GetConvarInt("core:randomUnlockedVehicleChance", 30),
+    requireKeys = GetConvarInt("core:requireKeys", 1) == 1,
     useInventoryForKeys = GetConvarInt("core:useInventoryForKeys", 1) == 1,
     groups = json.decode(GetConvar("core:groups", "[]")),
     compatibility = json.decode(GetConvar("core:compatibility", "[]"))

client/vehicle/main.lua

@@ -293,6 +293,7 @@ AddStateBagChangeHandler("props", nil, function(bagName, key, value, reserved, r
     lib.setVehicleProperties(entity, props)
 end)
 
+local playingKey = 0
 local function playKeyFob(veh)
     local keyFob
     local ped = cache.ped
@@ -300,12 +301,21 @@ local function playKeyFob(veh)
     if #(coords-GetEntityCoords(veh)) > 25.0 then return end
 
     if not playerVehicle then
+        playingKey += 1
+        SetPedCurrentWeaponVisible(ped, false, false)
         ClearPedTasks(ped)
         lib.requestAnimDict("anim@mp_player_intmenu@key_fob@")
         TaskPlayAnim(ped, "anim@mp_player_intmenu@key_fob@", "fob_click_fp", 8.0, 8.0, -1, 48, 1, false, false, false)
         keyFob = CreateObject(`lr_prop_carkey_fob`, 0, 0, 0, true, true, true)
         AttachEntityToEntity(keyFob, ped, GetPedBoneIndex(ped, 0xDEAD), 0.12, 0.04, -0.025, -100.0, 100.0, 0.0, true, true, false, true, 1, true)
         Wait(700)
+        SetTimeout(400, function()
+            playingKey -= 1
+        end)
+        SetTimeout(1200, function()
+            if playingKey > 0 then return end
+            SetPedCurrentWeaponVisible(ped, true, false)
+        end)
     end
 
     PlaySoundFromEntity(-1, "Remote_Control_Fob", ped, "PI_Menu_Sounds", true, 0)
@@ -470,22 +480,35 @@ CreateThread(function()
     local wait = 500
     while true do
         Wait(wait)
+
+        local reset = true
         playerVehicle = cache.seat == -1 and cache.vehicle
-        if playerVehicle then
-            if Config.disableVehicleAirControl and not vehicleClassNotDisableAirControl[GetVehicleClass(playerVehicle)] and (IsEntityInAir(playerVehicle) or IsEntityUpsidedown(playerVehicle)) then
-                wait = 0
-                DisableControlAction(0, 59) -- disable vehicle air control.
-                DisableControlAction(0, 60)
-            elseif not GetIsVehicleEngineRunning(playerVehicle) and not hasVehicleKeysCheck(playerVehicle) then
-                wait = 0
-                DisableControlAction(0, 59)
-                if DoesEntityExist(playerVehicle) and IsVehicleEngineStarting(playerVehicle) then
-                    SetVehicleEngineOn(playerVehicle, false, true, true) -- don't turn on engine if no keys.
-                end
-            else
-                wait = 500
+
+        local entering = GetVehiclePedIsEntering(cache.ped)
+        if entering and DoesEntityExist(entering) and IsVehicleNeedsToBeHotwired(entering) then
+            SetVehicleNeedsToBeHotwired(entering, false)
+        end
+        
+        if not playerVehicle then goto skip end
+
+        if Config.disableVehicleAirControl and not vehicleClassNotDisableAirControl[GetVehicleClass(playerVehicle)] and (IsEntityInAir(playerVehicle) or IsEntityUpsidedown(playerVehicle)) then
+            wait = 0
+            reset = false
+            DisableControlAction(0, 59) -- disable vehicle air control.
+            DisableControlAction(0, 60)
+        end
+        if Config.requireKeys and not GetIsVehicleEngineRunning(playerVehicle) and not hasVehicleKeysCheck(playerVehicle) then
+            wait = 0
+            reset = false
+            DisableControlAction(0, 59)
+            DisableControlAction(0, 71)
+            if DoesEntityExist(playerVehicle) and IsVehicleEngineStarting(playerVehicle) then
+                SetVehicleEngineOn(playerVehicle, false, true, true) -- don't turn on engine if no keys.
             end
-        elseif wait ~= 500 then
+        end
+
+        ::skip::
+        if (reset or not playerVehicle) and wait ~= 500 then
             wait = 500
         end
     end
@@ -697,9 +720,14 @@ lib.addKeybind({
             })
         end
         if not playerVehicle then return end
+
+        local speed = math.floor(GetEntitySpeed(playerVehicle) * 2.236936)
+        if speed < 10 then return end
+
         cruiseControlEnabled = true
-        cruiseSpeedVehicle = math.floor(GetEntitySpeed(playerVehicle) * 2.236936)
+        cruiseSpeedVehicle = speed
         cruiseSpeedSet = cruiseSpeedVehicle
+        
         lib.notify({
             title = "Cruise control",
             description = ("Set to %d mph."):format(math.floor(cruiseSpeedSet)),

compatibility/backwards/server.lua

@@ -5,13 +5,32 @@ exports("GetCoreObject", function()
 end)
 
 NDCore.Functions = {}
-NDCore.Functions.GetPlayer = NDCore.getPlayer
 NDCore.Functions.GetPlayers = NDCore.getPlayers
 NDCore.Functions.GetUserDiscordInfo = NDCore.getDiscordInfo
 NDCore.Functions.SetActiveCharacter = NDCore.setActiveCharacter
 NDCore.Functions.GetPlayerCharacters = NDCore.fetchAllCharacters
 NDCore.Functions.GetPlayerByCharacterId = NDCore.fetchCharacter
 
+function NDCore.Functions.GetPlayer(src)
+    local player = NDCore.getPlayer(src)
+    return {
+        source = player.source,
+        id = player.id,
+        firstName = player.firstname,
+        lastName = player.lastname,
+        dob = player.dob,
+        gender = player.gender,
+        cash = player.cash,
+        bank = player.bank,
+        phoneNumber = player.metadata.phone,
+        lastLocation = player.metadata.lastLocation,
+        inventory = player.inventory,
+        discordInfo = player.discordInfo,
+        data = player.metadata,
+        job = player.job
+    }
+end
+
 function NDCore.Functions.GetPlayerIdentifierFromType(identifierType, src)
     return GetPlayerIdentifierByType(src, identifierType)
 end

compatibility/esx/client.lua

@@ -60,7 +60,7 @@ function NDCore.GetPlayerData()
 
     player.coords = GetEntityCoords(cache.ped)
     player.loadout = {}
-    player.maxWeight = exports.ox_inventory:GetPlayerMaxWeight()
+    player.maxWeight = GetResourceState("ox_inventory") == "started" and exports.ox_inventory:GetPlayerMaxWeight() or 0
     player.money = player.Accounts.Money
     player.sex = player.gender
     player.firstName = player.firstname
@@ -112,7 +112,7 @@ function NDCore.Progressbar(message, lenght, options)
 end
 
 function NDCore.SearchInventory(item, count)
-    local itemCount = exports.ox_inventory:Search(item)
+    local itemCount =  GetResourceState("ox_inventory") == "started" and exports.ox_inventory:Search(item) or 0
     return itemCount >= count and itemCount
 end
 
@@ -133,7 +133,7 @@ function NDCore.ShowHelpNotification()
 end
 
 function NDCore.ShowInventory()
-    exports.ox_inventory:openInventory("player", cache.serverId)
+    return GetResourceState("ox_inventory") == "started" and exports.ox_inventory:openInventory("player", cache.serverId)
 end
 
 function NDCore.ShowNotification(msg, type, time)

compatibility/esx/server.lua

@@ -5,7 +5,8 @@ local registeredItems = {}
 
 local function getAmmoFromWeapon(weapon)
     if not weapon then return end
-    for item, data in pairs(exports.ox_inventory:Items()) do
+    local items = GetResourceState("ox_inventory") == "started" and exports.ox_inventory:Items() or {}
+    for item, data in pairs(items) do
         if data.weapon and data.model and data.model:lower() == weapon:lower() then
             return data.ammoname
         end
@@ -60,7 +61,7 @@ local function createPlayerFunctions(self)
     end
 
     function self.addInventoryItem(item, count)
-        exports.ox_inventory:AddItem(self.source, item, count)
+        return GetResourceState("ox_inventory") == "started" and exports.ox_inventory:AddItem(self.source, item, count)
     end
 
     function self.addMoney(amount)
@@ -100,11 +101,11 @@ local function createPlayerFunctions(self)
     end
 
     function self.canCarryItem(item, count)
-        return exports.ox_inventory:CanCarryItem(self.source, item, count)
+        return GetResourceState("ox_inventory") == "started" and exports.ox_inventory:CanCarryItem(self.source, item, count)
     end
 
     function self.canSwapItem(firstItem, firstItemCount, testItem, testItemCount)
-        exports.ox_inventory:CanSwapItem(self.source, firstItem, firstItemCount, testItem, testItemCount)
+        return GetResourceState("ox_inventory") == "started" and exports.ox_inventory:CanSwapItem(self.source, firstItem, firstItemCount, testItem, testItemCount)
     end
 
     function self.clearMeta(index)
@@ -137,7 +138,7 @@ local function createPlayerFunctions(self)
     end
 
     function self.getInventory(minimal)
-        local playerItems = exports.ox_inventory:GetInventoryItems(self.source)
+        local playerItems = GetResourceState("ox_inventory") == "started" and exports.ox_inventory:GetInventoryItems(self.source) or {}
         if not minimal then
             return playerItems
         end
@@ -145,7 +146,7 @@ local function createPlayerFunctions(self)
     end
 
     function self.getInventoryItem(item)
-        local playerItems = exports.ox_inventory:GetInventoryItems(self.source)
+        local playerItems = GetResourceState("ox_inventory") == "started" and exports.ox_inventory:GetInventoryItems(self.source) or {}
         for name, data in pairs(playerItems) do
             if name == item then
                 return data
@@ -162,11 +163,11 @@ local function createPlayerFunctions(self)
     end
     
     function self.hasItem(item, metadata)
-        return exports.ox_inventory:GetItem(self.source, item, metadata)
+        return GetResourceState("ox_inventory") == "started" and exports.ox_inventory:GetItem(self.source, item, metadata)
     end
 
     function self.removeInventoryItem(item, count)
-        exports.ox_inventory:RemoveItem(self.source, item, count)
+        return GetResourceState("ox_inventory") == "started" and exports.ox_inventory:RemoveItem(self.source, item, count)
     end
 
     function self.removeMoney(amount)
@@ -304,7 +305,8 @@ end
 function NDCore.GetItemLabel(item)
     if not itemNames then
         itemNames = {}
-        for item, data in pairs(exports.ox_inventory:Items()) do
+        local items = GetResourceState("ox_inventory") == "started" and exports.ox_inventory:Items() or {}
+        for item, data in pairs(items) do
             itemNames[item] = data.label
         end
     end

config_client.lua

@@ -1,74 +0,0 @@
--- For support join my discord: https://discord.gg/Z9Mxu72zZ6
-
-config = {
-    serverName = "Andy's Development",
-    characterLimit = 15, -- How many characters can a player create.
-    customPauseMenu = true, -- A custom pause menu will display your money, characters name and the server name in the pause menu.
-    enablePVP = true, -- pvp allows doing damage to other players.
-    
-    -- Money related
-    startingCash = 2500, -- default cash the character will start with if the character creator doesn't specify it.
-    startingBank = 8000,-- default money in the bank account the character will start with if the character creator doesn't specify it.
-    
-    -- If you'd like to whitelist certain roles on discord then set this to true and add role ids.
-    enableDiscordWhitelist = false,
-    notWhitelistedMessage = "You're not allowlisted in this server please join our discord to apply for a allowlist: https://discord.gg/Z9Mxu72zZ6",
-    whitelistRoles = {
-        "872921520719142932"
-    },
-
-    -- These are admins roles that will give a user permission to admin commands and more.
-    adminRoles = {
-        "872921520719142932"
-    },
-
-    -- Discord Rich presence
-    enableRichPresence = true,
-    updateIntervall = 60, -- how many seconds of delay until it updates status.
-    appId = 858146067018416128,
-    largeLogo = "andyyy",
-    smallLogo = "andyyy",
-    firstButtonName = "DISCORD",
-    firstButtonLink = "https://discord.gg/Z9Mxu72zZ6",
-    secondButtonName = "TEBEX",
-    secondButtonLink = "https://andyyy.tebex.io/category/fivem-scripts",
-
-
-    -- Groups can be gangs, jobs, subdivisions, etc.
-    groups = {
-        ["Ballas"] = {
-            "Member", -- rank 1
-            "Boss" -- rank 2
-        },
-        ["SWAT"] = {
-            "Member", -- rank 1
-            "Sniper", -- rank 2
-            "Team lead", -- rank 3
-            "Commander" -- rank 4
-        },
-        ["SAHP"] = {
-            "Trooper",
-            "Senior Trooper",
-            "Corporal",
-            "Sergeant",
-            "Lieutenant",
-            "Cheif"
-        },
-        ["LSPD"] = {
-            "Officer",
-            "Senior officer",
-            "Corporal",
-            "Sergeant",
-            "Lieutenant",
-            "Cheif"
-        },
-        ["BCSO"] = {
-            "Deputy",
-            "Senior Deputy",
-            "Corporal",
-            "Sergeant",
-            "Lieutenant",
-            "Cheif"
-        }
-    },
-}

config_server.lua

@@ -1,6 +0,0 @@
--- For support join my discord: https://discord.gg/Z9Mxu72zZ6
-
-server_config = {
-    discordServerToken = "OTAwODg1MDMxMDQ2Nzc0ODQ1.GU1TSC.Ed8D2_wcU-UQ1vZhe1khahgV8J3hLahOp4N1D8", -- discord bot token for permissions
-    guildId = "872496972454592523", -- discord guild id
-}

database/characters.sql

@@ -1,15 +1,16 @@
 CREATE TABLE IF NOT EXISTS `nd_characters` (
-	`charid` INT(10) NOT NULL AUTO_INCREMENT,
-	`identifier` VARCHAR(200) NOT NULL DEFAULT '0',
-	`name` VARCHAR(50) DEFAULT NULL,
-	`firstname` VARCHAR(50) DEFAULT NULL,
-	`lastname` VARCHAR(50) DEFAULT NULL,
-	`dob` VARCHAR(50) DEFAULT NULL,
-	`gender` VARCHAR(50) DEFAULT NULL,
-	`cash` INT(10) DEFAULT '0',
-	`bank` INT(10) DEFAULT '0',
-	`groups` LONGTEXT DEFAULT '[]',
-	`metadata` LONGTEXT DEFAULT '[]',
-	`inventory` LONGTEXT DEFAULT '[]',
-	PRIMARY KEY (`charid`) USING BTREE
+    `charid` INT(10) NOT NULL AUTO_INCREMENT,
+    `identifier` VARCHAR(200) NOT NULL DEFAULT '0',
+    `name` VARCHAR(50) DEFAULT NULL,
+    `firstname` VARCHAR(50) DEFAULT NULL,
+    `lastname` VARCHAR(50) DEFAULT NULL,
+    `dob` VARCHAR(50) DEFAULT NULL,
+    `gender` VARCHAR(50) DEFAULT NULL,
+    `cash` INT(10) DEFAULT '0',
+    `bank` INT(10) DEFAULT '0',
+    `phonenumber` VARCHAR(20) DEFAULT NULL,
+    `groups` LONGTEXT DEFAULT ('[]'),
+    `metadata` LONGTEXT DEFAULT ('[]'),
+    `inventory` LONGTEXT DEFAULT ('[]'),
+    PRIMARY KEY (`charid`) USING BTREE
 );

database/vehicles.sql

@@ -1,15 +1,15 @@
 CREATE TABLE IF NOT EXISTS `nd_vehicles` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`owner` INT(11) DEFAULT NULL,
-	`plate` VARCHAR(255) DEFAULT NULL,
-	`glovebox` LONGTEXT DEFAULT '[]',
-	`trunk` LONGTEXT DEFAULT '[]',
-	`properties` LONGTEXT DEFAULT '[]',
+    `id` INT(11) NOT NULL AUTO_INCREMENT,
+    `owner` INT(11) DEFAULT NULL,
+    `plate` VARCHAR(255) DEFAULT NULL,
+    `glovebox` LONGTEXT DEFAULT ('[]'),
+    `trunk` LONGTEXT DEFAULT ('[]'),
+    `properties` LONGTEXT DEFAULT ('[]'),
     `stored` INT(11) DEFAULT '1',
-	`impounded` INT(11) DEFAULT '0',
-	`stolen` INT(11) DEFAULT '0',
-    `metadata` LONGTEXT DEFAULT '[]',
-	PRIMARY KEY (`id`) USING BTREE,
-	INDEX `owner` (`owner`) USING BTREE,
-	CONSTRAINT `vehowner` FOREIGN KEY (`owner`) REFERENCES `nd_characters` (`charid`) ON UPDATE CASCADE ON DELETE CASCADE
+    `impounded` INT(11) DEFAULT '0',
+    `stolen` INT(11) DEFAULT '0',
+    `metadata` LONGTEXT DEFAULT ('[]'),
+    PRIMARY KEY (`id`) USING BTREE,
+    INDEX `owner` (`owner`) USING BTREE,
+    CONSTRAINT `vehowner` FOREIGN KEY (`owner`) REFERENCES `nd_characters` (`charid`) ON UPDATE CASCADE ON DELETE CASCADE
 );

fxmanifest.lua

@@ -2,7 +2,7 @@
 
 author "Andyyy#7666"
 description "ND Framework Core"
-version "2.0.0"
+version "2.1.2"
 
 fx_version "cerulean"
 game "gta5"
@@ -38,5 +38,7 @@ files {
 }
 
 dependency "oxmysql"
+
+-- below were used with backwards compatibility but could interfere with resources checking if the resources are started.
 -- provide "es_extended"
 -- provide "qb-Core"

server/commands.lua

@@ -194,27 +194,50 @@ end)
 lib.addCommand("pay", {
     help = "give money to nearby player.",
     params = {
+        {
+            name = "target",
+            type = "playerId",
+            help = "Target player's server id"
+        },
         {
             name = "amount",
-            type = "number"
+            type = "number",
+            help = "Amount of cash to give"
         }
     }
 }, function(source, args, raw)
     if not source then return end
-    local targetPlayer
-    local pedCoords = GetEntityCoords(GetPlayerPed(source))
-    for targetId, targetInfo in pairs(NDCore.players) do
-        local targetCoords = GetEntityCoords(GetPlayerPed(targetId))
-        if #(pedCoords-targetCoords) < 2.0 and targetId ~= source then
-            targetPlayer = targetInfo
-            break
-        end
-    end
 
     local player = NDCore.getPlayer(source)
-    if not player then return end
-    local success = player.deductMoney("cash", args.amount)
+    local targetPlayer = NDCore.getPlayer(args.target)
 
+    if not player or not targetPlayer then
+        return player.notify({
+            title = "Error",
+            description = "No player found",
+            type = "error"
+        })
+    end
+
+    if player.cash < args.amount then
+        return player.notify({
+            title = "Error",
+            description = "You don't have enough cash",
+            type = "error"
+        })
+    end
+
+    local playerCoords = GetEntityCoords(GetPlayerPed(player.source))
+    local targetCoords = GetEntityCoords(GetPlayerPed(targetPlayer.source))
+    if #(playerCoords-targetCoords) > 2.0 then
+        return player.notify({
+            title = "Error",
+            description = "Player is not nearby",
+            type = "error"
+        })
+    end
+
+    local success = player.deductMoney("cash", args.amount) and targetPlayer.addMoney("cash", args.amount)
     if not success then
         return player.notify({
             title = "Couldn't give money",
@@ -223,19 +246,18 @@ lib.addCommand("pay", {
         })
     end
     
-    if not targetPlayer or not targetPlayer.addMoney("cash", args.amount) then return end
     targetPlayer.notify({
         title = "Money received",
         description = ("Received $%d in cash"):format(args.amount),
         type = "inform",
-        duration = 10000
+        duration = 5000
     })
     
     player.notify({
         title = "Money given",
-        description = ("You gave someone $%d in cash"):format(args.amount),
+        description = ("You gave $%d in cash"):format(args.amount),
         type = "inform",
-        duration = 10000
+        duration = 5000
     })
 end)
 

server/events.lua

@@ -1,117 +0,0 @@
--- For support join my discord: https://discord.gg/Z9Mxu72zZ6
-
--- Check if discord is connected, and if whitelist is enabled then it will only allow you to join if you have the roles.
-AddEventHandler("playerConnecting", function(name, setKickReason, deferrals)
-    local player = source
-    local discordIdentifier = NDCore.Functions.GetPlayerIdentifierFromType("discord", player)
-
-    deferrals.defer()
-    Wait(0)
-    deferrals.update("Connecting to discord.")
-    Wait(0)
-
-    if not discordIdentifier then
-        deferrals.done("Your discord isn't connected to FiveM, make sure discord is open and restart FiveM.")
-    else
-        if config.enableDiscordWhitelist then
-            local discordUserId = discordIdentifier:gsub("discord:", "")
-            local discordInfo = NDCore.Functions.GetUserDiscordInfo(discordUserId)
-            for _, whitelistRole in pairs(config.whitelistRoles) do
-                if whitelistRole == 0 or whitelistRole == "0" or (discordInfo and discordInfo.roles[whitelistRole]) then
-                    deferrals.done()
-                    break
-                end
-            end
-            deferrals.done(config.notWhitelistedMessage)
-        else
-            deferrals.done()
-        end
-    end
-end)
-
--- Getting all the characters the player has and returning them to the client.
-RegisterNetEvent("ND:GetCharacters", function()
-    local player = source
-    TriggerClientEvent("ND:returnCharacters", player, NDCore.Functions.GetPlayerCharacters(player))
-end)
-
--- Creating a new character.
-RegisterNetEvent("ND:newCharacter", function(newCharacter)
-    local player = source
-    NDCore.Functions.CreateCharacter(player, newCharacter.firstName, newCharacter.lastName, newCharacter.dob, newCharacter.gender, newCharacter.cash, newCharacter.bank)
-end)
-
--- Update the character info when edited.
-RegisterNetEvent("ND:editCharacter", function(newCharacter)
-    local player = source
-    local characters = NDCore.Functions.GetPlayerCharacters(player)
-    if not characters[newCharacter.id] then return end
-    NDCore.Functions.UpdateCharacterData(newCharacter.id, newCharacter.firstName, newCharacter.lastName, newCharacter.dob, newCharacter.gender)
-end)
-
--- Delete character from database.
-RegisterNetEvent("ND:deleteCharacter", function(characterId)
-    local player = source
-    local characters = NDCore.Functions.GetPlayerCharacters(player)
-    if not characters[characterId] then return end
-    NDCore.Functions.DeleteCharacter(characterId)
-end)
-
--- add a player to the table.
-RegisterNetEvent("ND:setCharacterOnline", function(id)
-    local player = source
-    local characters = NDCore.Functions.GetPlayerCharacters(player)
-    if not characters[id] then return end
-    NDCore.Functions.SetActiveCharacter(player, id)
-end)
-
--- Update the characters clothes.
-RegisterNetEvent("ND:updateClothes", function(clothing)
-    local player = source
-    local character = NDCore.Players[player]
-    NDCore.Functions.SetPlayerData(character.id, "clothing", clothing)
-end)
-
--- Disconnecting a player
-RegisterNetEvent("ND:exitGame", function()
-    local player = source
-    DropPlayer(player, "Disconnected.")
-end)
-
--- Remove player from NDCore.Players table when they leave.
-AddEventHandler("playerDropped", function()
-    local player = source
-    local character = NDCore.Players[player]
-    if character then
-        local ped = GetPlayerPed(player)
-        local lastLocation = GetEntityCoords(ped)
-        NDCore.Functions.UpdateLastLocation(character.id, {x = lastLocation.x, y = lastLocation.y, z = lastLocation.z})
-    end
-    TriggerEvent("ND:characterUnloaded", player, character)
-    character = nil
-end)
-
--- Get player discord info on join.
-AddEventHandler("playerJoining", function()
-    local src = source
-
-    local discordUserId = NDCore.Functions.GetPlayerIdentifierFromType("discord", src):gsub("discord:", "")
-    local discordInfo = NDCore.Functions.GetUserDiscordInfo(discordUserId)
-
-    NDCore.PlayersDiscordInfo[src] = discordInfo
-end)
-
-AddEventHandler("onResourceStart", function(resourceName)
-    if (GetCurrentResourceName() ~= resourceName) then
-        return
-    end 
-    Wait(1000)
-
-    if not next(NDCore.PlayersDiscordInfo) then
-        for _, playerId in ipairs(GetPlayers()) do
-            local discordUserId = NDCore.Functions.GetPlayerIdentifierFromType("discord", playerId):gsub("discord:", "")
-            local discordInfo = NDCore.Functions.GetUserDiscordInfo(discordUserId)
-            NDCore.PlayersDiscordInfo[tonumber(playerId)] = discordInfo
-        end
-    end
-end)

server/functions.lua

@@ -34,6 +34,13 @@ function NDCore.getPlayerServerInfo(source)
     return PlayersInfo[source]
 end
 
+function NDCore.getConfig(info)
+    if not info then
+        return Config
+    end
+    return Config[info]
+end
+
 ---@param fileLocation string|tabale
 ---@return boolean
 function NDCore.loadSQL(fileLocation, resource)

server/main.lua

@@ -7,6 +7,7 @@ local tempPlayersInfo = {}
 Config = {
     serverName = GetConvar("core:serverName", "Unconfigured ND-Core Server"),
     discordInvite = GetConvar("core:discordInvite", "https://discord.gg/Z9Mxu72zZ6"),
+    discordMemeberRequired = GetConvarInt("core:discordMemeberRequired", 1) == 1,
     discordAppId = GetConvar("core:discordAppId", "858146067018416128"),
     discordAsset = GetConvar("core:discordAsset", "andyyy"),
     discordAssetSmall = GetConvar("core:discordAssetSmall", "andyyy"),
@@ -46,8 +47,9 @@ end
 
 AddEventHandler("playerJoining", function(oldId)
     local src = source
-    PlayersInfo[src] = tempPlayersInfo[oldId]
-    tempPlayersInfo[oldId] = nil
+    local oldTempId = tonumber(oldId)
+    PlayersInfo[src] = tempPlayersInfo[oldTempId]
+    tempPlayersInfo[oldTempId] = nil
 
     if Config.multiCharacter then return end
     Wait(3000)
@@ -93,14 +95,14 @@ AddEventHandler("playerConnecting", function(name, setKickReason, deferrals)
     local tempSrc = source
     local identifiers = getIdentifierList(tempSrc)
     local mainIdentifier = identifiers[Config.characterIdentifier]
-    local discordInfo = {}
+    local discordInfo = nil
 
     deferrals.defer()
     Wait(0)
 
-    if mainIdentifier and Config.discordBotToken ~= "false" and Config.discordGuildId ~= "false" and not discordInfo then
+    if mainIdentifier and Config.discordBotToken ~= "false" and Config.discordGuildId ~= "false" then
         discordInfo = checkDiscordIdentifier(identifiers)
-        if not discordInfo then
+        if not discordInfo and Config.discordMemeberRequired then
             deferrals.done(("Your discord was not found, join our discord here: %s."):format(Config.discordInvite))
             Wait(0)
         end

server/player.lua

@@ -25,6 +25,7 @@ local function createCharacterTable(info)
         gender = info.gender,
         cash = info.cash,
         bank = info.bank,
+        phonenumber = info.phonenumber,
         groups = info.groups,
         metadata = info.metadata,
         inventory = info.inventory
@@ -164,8 +165,23 @@ local function createCharacterTable(info)
     end
     
     -- Save character information to database
-    function self.save()
-        local affectedRows = MySQL.update.await("UPDATE nd_characters SET name = ?, firstname = ?, lastname = ?, dob = ?, gender = ?, cash = ?, bank = ?, groups = ?, metadata = ? WHERE charid = ?", {
+    function self.save(key)
+        if key then
+            local charData = self[key]
+            if not charData or type(charData) == "function" then
+                return lib.print.error(key, "Is not valid character data.")
+            end
+
+            if type(charData) == "table" then
+                charData = json.encode(charData)
+            end
+
+            local query = ("UPDATE nd_characters SET `%s` = ? WHERE charid = ?"):format(key)
+            local affectedRows = MySQL.update.await(query, {charData, self.id})
+            return affectedRows > 0
+        end
+
+        local affectedRows = MySQL.update.await("UPDATE nd_characters SET name = ?, firstname = ?, lastname = ?, dob = ?, gender = ?, cash = ?, bank = ?, phonenumber = ?, `groups` = ?, metadata = ? WHERE charid = ?", {
             self.name,
             self.firstname,
             self.lastname,
@@ -173,6 +189,7 @@ local function createCharacterTable(info)
             self.gender,
             self.cash,
             self.bank,
+            self.phonenumber,
             json.encode(self.groups),
             json.encode(self.metadata),
             self.id
@@ -309,20 +326,28 @@ local function createCharacterTable(info)
     ---@return boolean
     function self.addGroup(name, rank, isJob)
         local groupRank = tonumber(rank) or 1
-        local groupInfo = Config.groups[name]
+        local groupInfo = Config.groups?[name]
+        local bossRank = groupInfo and groupInfo.minimumBossRank
+
         -- if not groupInfo then return end
         if isJob then
             for _, group in pairs(self.groups) do
                 group.isJob = nil
             end
         end
+
         self.groups[name] = {
+            name = name,
             label = groupInfo and groupInfo.label or name,
             rankName = groupInfo and groupInfo.ranks[groupRank] or groupRank,
             rank = groupRank,
-            isJob = isJob
+            isJob = isJob,
+            isBoss = bossRank and groupRank >= bossRank
         }
-        self.triggerEvent("ND:updateCharacter", removeCharacterFunctions(self))
+        
+        if not isJob then
+            self.triggerEvent("ND:updateCharacter", removeCharacterFunctions(self))
+        end
         lib.addPrincipal(self.source, ("group.%s"):format(name))
         return self.groups[name]
     end
@@ -337,6 +362,12 @@ local function createCharacterTable(info)
     function self.removeGroup(name)
         local group = self.groups[name]
         if not group then return end
+
+        if self.job == name then
+            self.job = nil
+            self.jobInfo = nil
+        end
+
         self.groups[name] = nil
         self.triggerEvent("ND:updateCharacter", removeCharacterFunctions(self))
         lib.removePrincipal(self.source, ("group.%s"):format(name))
@@ -349,11 +380,11 @@ local function createCharacterTable(info)
     function self.setJob(name, rank)
         self.removeGroup(self.job)
         local job = self.addGroup(name, rank, true)
-        local jobName, jobInfo = self.getJob()
-        if jobInfo then
-            self.job = jobName
-            self.jobInfo = jobInfo
+        if job then
+            self.job = job.name
+            self.jobInfo = job
         end
+        self.triggerEvent("ND:updateCharacter", removeCharacterFunctions(self))
         return job
     end
 
@@ -393,12 +424,13 @@ function NDCore.newCharacter(src, info)
         gender = info.gender or "",
         cash = info.cash or 0,
         bank = info.bank or 0,
+        phonenumber = info.phonenumber,
         groups = info.groups or {},
         metadata = info.metadata or {},
-        inventory = info.inventory or {},
+        inventory = info.inventory or {}
     }
 
-    charInfo.id = MySQL.insert.await("INSERT INTO nd_characters (identifier, name, firstname, lastname, dob, gender, cash, bank, groups, metadata) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", {
+    charInfo.id = MySQL.insert.await("INSERT INTO nd_characters (identifier, name, firstname, lastname, dob, gender, cash, bank, phonenumber, `groups`, metadata) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", {
         identifier,
         charInfo.name,
         charInfo.firstname,
@@ -407,6 +439,7 @@ function NDCore.newCharacter(src, info)
         charInfo.gender,
         charInfo.cash,
         charInfo.bank,
+        charInfo.phonenumber,
         json.encode(charInfo.groups),
         json.encode(charInfo.metadata)
     })
@@ -437,6 +470,7 @@ function NDCore.fetchCharacter(id, src)
         gender = info.gender,
         cash = info.cash,
         bank = info.bank,
+        phonenumber = info.phonenumber,
         groups = json.decode(info.groups),
         metadata = json.decode(info.metadata),
         inventory = json.decode(info.inventory)
@@ -462,9 +496,10 @@ function NDCore.fetchAllCharacters(src)
             gender = info.gender,
             cash = info.cash,
             bank = info.bank,
+            phonenumber = info.phonenumber,
             groups = json.decode(info.groups),
             metadata = json.decode(info.metadata),
-            inventory = json.decode(info.inventory),
+            inventory = json.decode(info.inventory)
         })
     end
     return characters

server/vehicle.lua

@@ -90,6 +90,9 @@ function NDCore.getVehicle(entity)
         if saveProperties and self.id and self.owner then
             local properties = lib.callback.await("ND_Vehicles:getProps", NetworkGetEntityOwner(entity), self.netId)
             if properties then
+                if self.properties?.callsign then
+                    properties.callsign = true
+                end
                 MySQL.query("UPDATE nd_vehicles SET properties = ? WHERE id = ?", {json.encode(properties), self.id})
             end
         end
@@ -102,6 +105,11 @@ function NDCore.getVehicle(entity)
         if not DoesEntityExist(entity) then return end
         local properties = type(props) == "string" and json.decode(props) or props
         local state = Entity(entity).state
+
+        if self.properties?.callsign then
+            properties.callsign = true
+        end
+
         state.props = properties
         self.properties = properties
         
@@ -406,11 +414,27 @@ function NDCore.spawnOwnedVehicle(source, vehicleId, coords, heading)
     if not vehicle or not vehicle.available or vehicle.owner ~= player.id then return end
 
     MySQL.query.await("UPDATE nd_vehicles SET stored = ? WHERE id = ?", {0, vehicleId})
+
+    local properties = vehicle.properties
+    if properties.callsign then
+        local callsign = player.getMetadata("callsign")
+        if not callsign or callsign == "" then goto skip end
+        
+        callsign = tostring(callsign)
+        if not callsign or callsign:len() ~= 3 then goto skip end
+
+        properties.modFender = tonumber(callsign:sub(1, 1))
+        properties.modRightFender = tonumber(callsign:sub(2, 2))
+        properties.modRoof = tonumber(callsign:sub(3, 3))
+    end
+
+    ::skip::
+
     return NDCore.createVehicle({
         owner = player.id,
-        model = vehicle.properties.model,
+        model = properties.model,
         coords = vec4(coords.x, coords.y, coords.z, coords.w or coords.heading or heading),
-        properties = vehicle.properties,
+        properties = properties,
         vehicleId = vehicleId,
         source = source
     })
@@ -567,12 +591,24 @@ RegisterNetEvent("ND_Vehicles:toggleVehicleLock", function(netId)
 end)
 
 -- locking of npc vehicles, if the players spawns inside a vehicle it won't be locked.
-RegisterNetEvent("entityCreated", function(entity)
+AddEventHandler("entityCreated", function(entity)
+    local time = os.time()
+    while not DoesEntityExist(entity) and os.time()-time < 5 do Wait(50) end
+
     if not DoesEntityExist(entity) or GetEntityType(entity) ~= 2 then return end
+
     local state = Entity(entity).state
     if state.owner or state.locked ~= nil then return end
 
+    time = os.time()
     local driver = GetPedInVehicleSeat(entity, -1)
+    while DoesEntityExist(entity) and driver == 0 and os.time()-time < 2 do
+        driver = GetPedInVehicleSeat(entity, -1)
+        Wait(100)
+    end
+
+    if not DoesEntityExist(entity) then return end
+
     if DoesEntityExist(driver) and IsPedAPlayer(driver) then
         state.locked = false
         state.hotwired = true

shared/import.lua

@@ -1 +0,0 @@
-NDCore = exports["ND_Core"]:GetCoreObject()

shared/main.lua

@@ -1,30 +0,0 @@
-local startedResources = {}
-local callbacks = {}
-
-AddEventHandler("onResourceStart", function(resourceName)
-    startedResources[resourceName] = true
-    local callback = callbacks[resourceName]
-    if not callback then return end
-    callback(true)
-end)
-
-AddEventHandler("onResourceStop", function(resourceName)
-    startedResources[resourceName] = nil
-    local callback = callbacks[resourceName]
-    if not callback then return end
-    callback(false)
-end)
-
-function isResourceStarted(resourceName, cb)
-    local started = GetResourceState(resourceName) == "started"
-    startedResources[resourceName] = started
-
-    if cb then
-        callbacks[resourceName] = cb
-        cb(started)
-    end
-    
-    return started
-end
-
-exports("isResourceStarted", isResourceStarted)