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 1/6] 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. From ade0652ee2edc7aff241e244aa4a62145d6f24f5 Mon Sep 17 00:00:00 2001 From: KamuiKody <62488881+KamuiKody@users.noreply.github.com> Date: Sun, 4 Sep 2022 23:05:02 -0400 Subject: [PATCH 2/6] fix variable --- client/events.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/events.lua b/client/events.lua index 2e00992..b4f91d0 100644 --- a/client/events.lua +++ b/client/events.lua @@ -118,11 +118,12 @@ 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 = QBCore.Functions.GetPlate(info.vehicle), + plate = plate, driver = GetPedInVehicleSeat(info.vehicle, -1), inseat = GetPedInVehicleSeat(info.vehicle, info.seat), haskeys = exports['qb-vehiclekeys']:HasKeys(plate) From 72f036b608c0fcdd4ac7a5d9eb6ba30b4233953b Mon Sep 17 00:00:00 2001 From: KamuiKody <62488881+KamuiKody@users.noreply.github.com> Date: Sat, 19 Nov 2022 06:39:50 -0500 Subject: [PATCH 3/6] vehicle mispelling --- shared/vehicles.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shared/vehicles.lua b/shared/vehicles.lua index 82fbffb..32f9dbf 100644 --- a/shared/vehicles.lua +++ b/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'] = { From a62c17a67ad6befdfccc4f1477ee32306b3fe250 Mon Sep 17 00:00:00 2001 From: KamuiKody <62488881+KamuiKody@users.noreply.github.com> Date: Sat, 19 Nov 2022 06:42:02 -0500 Subject: [PATCH 4/6] Fix Misspelling --- shared/vehicles.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shared/vehicles.lua b/shared/vehicles.lua index 82fbffb..32f9dbf 100644 --- a/shared/vehicles.lua +++ b/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'] = { From 78fd87d126124fc8456bf112b798b084f5fe21aa Mon Sep 17 00:00:00 2001 From: Charlie Date: Sat, 19 Nov 2022 11:49:24 +0000 Subject: [PATCH 5/6] Bump version --- fxmanifest.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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', From 312f24d245a6cf66d45f9f4fcb2f52838a2b361c Mon Sep 17 00:00:00 2001 From: Chris Sinclair <18537102+MannaMuncher@users.noreply.github.com> Date: Sun, 11 Dec 2022 04:43:10 -0800 Subject: [PATCH 6/6] Bypass for loading QBCore in FxDK (#792) FxDK does not include license identifiers by default and thus breaks scripts that utilize those. Without this you will get the "No valid Rockstar license" error when connecting. This fix was not my own I found it in the post linked below and tested myself. https://forum.cfx.re/t/connection-rejected-by-server-fxdk/2504365/5 Co-authored-by: Kakarot <57848836+GhzGarage@users.noreply.github.com> Co-authored-by: Stan <96954031+tom-osborne@users.noreply.github.com> Co-authored-by: Zerio <54480523+Z3rio@users.noreply.github.com> --- server/events.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/events.lua b/server/events.lua index 899ac05..6bd9e22 100644 --- a/server/events.lua +++ b/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