From 8386143cd730a4fbc83f5fbc4b1cd5430392fda8 Mon Sep 17 00:00:00 2001
From: KamuiKody <62488881+KamuiKody@users.noreply.github.com>
Date: Sun, 4 Sep 2022 22:51:27 -0400
Subject: [PATCH] Framework Optimization

for optimization of other resources.
---
 client/events.lua | 12 ++++++++++++
 server/events.lua | 44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/client/events.lua b/client/events.lua
index b183bfb..2e00992 100644
--- a/client/events.lua
+++ b/client/events.lua
@@ -117,6 +117,18 @@ RegisterNetEvent('QBCore:Command:GoToMarker', function()
 end)
 
 -- Vehicle Commands
+RegisterNetEvent('QBCore:Client:VehicleInfo', function(info)
+    local data = {
+        vehicle = NetToVeh(info.netid),
+        seat = info.seat,
+        name = info.modelName,
+        plate = QBCore.Functions.GetPlate(info.vehicle),
+        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/server/events.lua b/server/events.lua
index 06876ce..9083c63 100644
--- a/server/events.lua
+++ b/server/events.lua
@@ -165,6 +165,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.