diff --git a/client/events.lua b/client/events.lua index b183bfb..b4f91d0 100644 --- a/client/events.lua +++ b/client/events.lua @@ -117,6 +117,19 @@ RegisterNetEvent('QBCore:Command:GoToMarker', function() end) -- Vehicle Commands +RegisterNetEvent('QBCore:Client:VehicleInfo', function(info) + local plate = QBCore.Functions.GetPlate(info.vehicle) + local data = { + vehicle = NetToVeh(info.netid), + seat = info.seat, + name = info.modelName, + plate = plate, + driver = GetPedInVehicleSeat(info.vehicle, -1), + inseat = GetPedInVehicleSeat(info.vehicle, info.seat), + haskeys = exports['qb-vehiclekeys']:HasKeys(plate) + } + TriggerEvent('QBCore:Client:'..info.event..'Vehicle', data) +end) RegisterNetEvent('QBCore:Command:SpawnVehicle', function(vehName) local ped = PlayerPedId() diff --git a/fxmanifest.lua b/fxmanifest.lua index 4ffd5bc..1b2f859 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -2,7 +2,7 @@ fx_version 'cerulean' game 'gta5' description 'QB-Core' -version '1.1.0' +version '1.2.0' shared_scripts { 'config.lua', diff --git a/server/events.lua b/server/events.lua index 80bdbcd..899ac05 100644 --- a/server/events.lua +++ b/server/events.lua @@ -191,6 +191,50 @@ RegisterNetEvent('QBCore:ToggleDuty', function() TriggerClientEvent('QBCore:Client:SetDuty', src, Player.PlayerData.job.onduty) end) +-- BaseEvents + +-- Vehicles +RegisterServerEvent('baseevents:enteringVehicle', function(veh,seat,modelName,netid) + local src = source + local data = { + vehicle = veh, + seat = seat, + name = modelName, + netid = netid, + event = 'Entering' + } + TriggerClientEvent('QBCore:Client:VehicleInfo', src, data) +end) + +RegisterServerEvent('baseevents:enteredVehicle', function(veh,seat,modelName,netid) + local src = source + local data = { + vehicle = veh, + seat = seat, + name = modelName, + netid = netid, + event = 'Entered' + } + TriggerClientEvent('QBCore:Client:VehicleInfo', src, data) +end) + +RegisterServerEvent('baseevents:enteringAborted', function() + local src = source + TriggerClientEvent('QBCore:Client:AbortVehicleEntering', src) +end) + +RegisterServerEvent('baseevents:leftVehicle', function(veh,seat,modelName,netid) + local src = source + local data = { + vehicle = veh, + seat = seat, + name = modelName, + netid = netid, + event = 'Left' + } + TriggerClientEvent('QBCore:Client:VehicleInfo', src, data) +end) + -- Items -- This event is exploitable and should not be used. It has been deprecated, and will be removed soon.