FumeNodes/ND_Core
1
0
Fork 0
mirror of https://github.com/ND-Framework/ND_Core.git synced 2026-08-16 21:46:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(vehicle): netId & properties inconsistencies

Browse Source
This commit is contained in:
Andyyy7666
2023-09-26 23:00:51 +02:00
parent 276274cf74
commit 698707c992
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
client/vehicle/main.lua
View File

@@ -241,13 +241,16 @@ local function getVehicleBlipSprite(entity)
return typeBlip[model] or classBlip[class] or 225 -- 255 is default car blip
end
RegisterNetEvent("ND_Vehicles:blip", function(netId, status)
local function getVehFromNetId(netId)
local time = GetCloudTimeAsInt()
while not NetworkDoesNetworkIdExist(netId) or not NetworkDoesEntityExistWithNetworkId(netId) and time-GetCloudTimeAsInt() < 5 do
Wait(100)
end
return NetToVeh(netId)
end
local veh = NetToVeh(netId)
RegisterNetEvent("ND_Vehicles:blip", function(netId, status)
local veh = getVehFromNetId(netId)
if not veh then return end
if not status then
local blip = GetBlipFromEntity(veh)
@@ -265,16 +268,16 @@ RegisterNetEvent("ND_Vehicles:blip", function(netId, status)
EndTextCommandSetBlipName(blip)
end)
RegisterNetEvent("ND_Vehicles:syncAlarm", function(netid)
local veh = NetToVeh(netid)
RegisterNetEvent("ND_Vehicles:syncAlarm", function(netId)
local veh = getVehFromNetId(netId)
if not veh then return end
SetVehicleAlarmTimeLeft(veh, 1)
SetVehicleAlarm(veh, true)
StartVehicleAlarm(veh)
end)
RegisterNetEvent("ND_VehicleSystem:setOwnedIfNot", function(netid)
local veh = NetToVeh(netid)
RegisterNetEvent("ND_VehicleSystem:setOwnedIfNot", function(netId)
local veh = getVehFromNetId(netId)
if not veh then return end
setVehicleOwned(veh, true)
setVehicleLocked(veh, true)
@@ -312,8 +315,8 @@ local function playKeyFob(veh)
return keyFob and DeleteEntity(keyFob)
end
RegisterNetEvent("ND_Vehicles:keyFob", function(vehicleNetId)
playKeyFob(NetToVeh(vehicleNetId))
RegisterNetEvent("ND_Vehicles:keyFob", function(netId)
playKeyFob(getVehFromNetId(netId))
end)
local dontLock = {
@@ -339,10 +342,12 @@ AddStateBagChangeHandler("locked", nil, function(bagName, key, value, reserved,
end)
end)
lib.callback.register("ND_Vehicles:getProps", function()
local veh = GetVehiclePedIsIn(cache.ped)
lib.callback.register("ND_Vehicles:getProps", function(netId)
local veh = getVehFromNetId(netId)
local props = lib.getVehicleProperties(veh)
local colorPrimary, colorSecondary = GetVehicleColours(veh)
if not props then return end
props.colorNamePrimary = vehicleColorNames[colorPrimary]
props.colorNameSecondary = vehicleColorNames[colorSecondary]
props.colorName = props.colorNamePrimary == props.colorNameSecondary and props.colorNamePrimary or ("%s & %s"):format(props.colorNamePrimary, props.colorNameSecondary)

6
server/vehicle.lua
View File

@@ -87,8 +87,10 @@ function NDCore.getVehicle(entity)
function self.delete(saveProperties)
if not DoesEntityExist(entity) then return end
if saveProperties and self.id and self.owner then
local properties = lib.callback.await("ND_Vehicles:getProps", NetworkGetEntityOwner(entity))
MySQL.query("UPDATE nd_vehicles SET properties = ? WHERE id = ?", {json.encode(properties), self.id})
local properties = lib.callback.await("ND_Vehicles:getProps", NetworkGetEntityOwner(entity), self.netId)
if properties then
MySQL.query("UPDATE nd_vehicles SET properties = ? WHERE id = ?", {json.encode(properties), self.id})
end
end
DeleteEntity(entity)
end