Merge branch 'main' into chore/vscode

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()

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',

server/events.lua

@@ -41,6 +41,10 @@ local function onPlayerConnecting(name, _, deferrals)
         end
     end
 
+    if GetConvarInt("sv_fxdkMode", false) then
+        license = 'license:AAAAAAAAAAAAAAAA' -- Dummy License
+    end
+
     if not license then
         deferrals.done(Lang:t('error.no_valid_license'))
     elseif QBCore.Config.Server.CheckDuplicateLicense and QBCore.Functions.IsLicenseInUse(license) then
@@ -191,6 +195,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.

shared/vehicles.lua

@@ -5298,14 +5298,14 @@ QBShared.Vehicles = {
         ['hash'] = `handler`,
         ['shop'] = 'truck',
     },
-    ['bulldoze'] = {
+    ['bulldozer'] = {
         ['name'] = 'Bulldozer',
         ['brand'] = 'HVY',
-        ['model'] = 'bulldoze',
+        ['model'] = 'bulldozer',
         ['price'] = 30000,
         ['category'] = 'industrial',
         ["categoryLabel"] = 'Industrial',
-        ['hash'] = `bulldoze`,
+        ['hash'] = `bulldozer`,
         ['shop'] = 'truck',
     },
     ['dump'] = {