Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Moving to server side checks for inventory #422

Closed
wants to merge 7 commits into from
Closed

Moving to server side checks for inventory #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9084091
Security Fix
r0adra93 Nov 14, 2022
e22b493
Merge branch 'main' into r0ad_security_fix
Z3rio Dec 12, 2022
a8b2095
security enhancements
r0adra93 Dec 17, 2022
25c7e48
Update job.lua
r0adra93 Dec 31, 2022
7a460b8
Merge branch 'r0ad_security_fix' of https://github.com/r0adra93/qb-po…
r0adra93 Dec 31, 2022
d47fef5
Merge branch 'main' into r0ad_security_fix
r0adra93 Jan 4, 2023
0dc03ee
Merge branch 'main' into r0ad_security_fix
r0adra93 Jan 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 20 additions & 43 deletions client/job.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,26 +45,6 @@ local function openFingerprintUI()
SetNuiFocus(true, true)
end

local function SetCarItemsInfo()
local items = {}
for _, item in pairs(Config.CarItems) do
local itemInfo = QBCore.Shared.Items[item.name:lower()]
items[item.slot] = {
name = itemInfo["name"],
amount = tonumber(item.amount),
info = item.info,
label = itemInfo["label"],
description = itemInfo["description"] and itemInfo["description"] or "",
weight = itemInfo["weight"],
type = itemInfo["type"],
unique = itemInfo["unique"],
useable = itemInfo["useable"],
image = itemInfo["image"],
slot = item.slot,
}
end
Config.CarItems = items
end

local function doCarDamage(currentVehicle, veh)
local smash = false
Expand Down Expand Up @@ -131,29 +111,27 @@ function TakeOutImpound(vehicle)
end
end

function TakeOutVehicle(vehicleInfo)
local function TakeOutVehicle(data)
if QBCore.Shared.QBJobsStatus then return end
local coords = Config.Locations["vehicle"][currentGarage]
if coords then
QBCore.Functions.TriggerCallback('QBCore:Server:SpawnVehicle', function(netId)
local veh = NetToVeh(netId)
SetCarItemsInfo()
SetVehicleNumberPlateText(veh, Lang:t('info.police_plate')..tostring(math.random(1000, 9999)))
SetEntityHeading(veh, coords.w)
exports['LegacyFuel']:SetFuel(veh, 100.0)
closeMenuFull()
if Config.VehicleSettings[vehicleInfo] ~= nil then
if Config.VehicleSettings[vehicleInfo].extras ~= nil then
QBCore.Shared.SetDefaultVehicleExtras(veh, Config.VehicleSettings[vehicleInfo].extras)
end
if Config.VehicleSettings[vehicleInfo].livery ~= nil then
SetVehicleLivery(veh, Config.VehicleSettings[vehicleInfo].livery)
end
end
TaskWarpPedIntoVehicle(PlayerPedId(), veh, -1)
TriggerEvent("vehiclekeys:client:SetOwner", QBCore.Functions.GetPlate(veh))
TriggerServerEvent("inventory:server:addTrunkItems", QBCore.Functions.GetPlate(veh), Config.CarItems)
SetVehicleEngineOn(veh, true, true)
end, vehicleInfo, coords, true)
data.plate = Lang:t('info.police_plate')..tostring(math.random(1000, 9999))
SetVehicleNumberPlateText(veh, data.plate)
QBCore.Functions.TriggerCallback("police:server:addVehItems", function()
exports['LegacyFuel']:SetFuel(veh, 100.0)
SetEntityHeading(veh, coords.w)
closeMenuFull()
if Config.VehicleSettings[data.vehicle] ~= nil then
if Config.VehicleSettings[data.vehicle].extras ~= nil then QBCore.Shared.SetDefaultVehicleExtras(veh, Config.VehicleSettings[data.vehicle].extras) end
if Config.VehicleSettings[data.vehicle].livery ~= nil then SetVehicleLivery(veh, Config.VehicleSettings[data.vehicle].livery) end
end
TaskWarpPedIntoVehicle(PlayerPedId(), veh, -1)
TriggerEvent("vehiclekeys:client:SetOwner", data.plate)
SetVehicleEngineOn(veh, true, true)
end, data.plate)
end, data.vehicle, coords, true)
end
end

Expand Down Expand Up @@ -414,9 +392,8 @@ RegisterNetEvent('police:client:TakeOutImpound', function(data)
end)

RegisterNetEvent('police:client:TakeOutVehicle', function(data)
if inGarage then
local vehicle = data.vehicle
TakeOutVehicle(vehicle)
if inGarage and Config.AuthorizedVehicles[PlayerJob.grade.level][data.vehicle] then
TakeOutVehicle(data)
end
end)

Expand Down Expand Up @@ -801,7 +778,7 @@ else
local dutyZones = {}
for _, v in pairs(Config.Locations["duty"]) do
dutyZones[#dutyZones+1] = BoxZone:Create(
vector3(vector3(v.x, v.y, v.z)), 1.75, 1, {
vector3(v.x, v.y, v.z), 1.75, 1, {
name="box_zone",
debugPoly = false,
minZ = v.z - 1,
Expand Down
89 changes: 66 additions & 23 deletions server/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,40 @@ local function CreateObjectId()
end
end

local function SetCarItemsInfo()
if QBCore.Shared.QBJobsStatus then return end
local items = {}
local index = 1
if Config.CarItems then
for _,v in pairs(Config.CarItems) do
local itemInfo = QBCore.Shared.Items[v.name:lower()]
items[index] = {
name = itemInfo["name"],
amount = tonumber(v.amount),
info = v.info,
label = itemInfo["label"],
description = itemInfo["description"] and itemInfo["description"] or "",
weight = itemInfo["weight"],
type = itemInfo["type"],
unique = itemInfo["unique"],
useable = itemInfo["useable"],
image = itemInfo["image"],
slot = index,
}
index = index + 1
end
end
return items
end

local function addTrunkItems(plate)
if QBCore.Shared.QBJobsStatus then return end
local trunkItems = SetCarItemsInfo()
if trunkItems then
exports['qb-inventory']:addTrunkItems(plate, trunkItems)
end
end

local function IsVehicleOwned(plate)
local result = MySQL.scalar.await('SELECT plate FROM player_vehicles WHERE plate = ?', {plate})
return result
Expand Down Expand Up @@ -617,7 +651,14 @@ QBCore.Functions.CreateCallback('police:server:IsPoliceForcePresent', function(_
cb(retval)
end)

QBCore.Functions.CreateCallback('police:server:addVehItems', function(_,cb,plate)
if QBCore.Shared.QBJobsStatus then return end
addTrunkItems(plate)
cb("ok")
end)
-- Events


AddEventHandler('onResourceStart', function(resourceName)
if resourceName == GetCurrentResourceName() then
CreateThread(function()
Expand Down Expand Up @@ -797,29 +838,31 @@ RegisterNetEvent('heli:spotlight', function(state)
TriggerClientEvent('heli:spotlight', -1, serverID, state)
end)

-- RegisterNetEvent('police:server:FlaggedPlateTriggered', function(camId, plate, street1, street2, blipSettings)
-- local src = source
-- for k, v in pairs(QBCore.Functions.GetPlayers()) do
-- local Player = QBCore.Functions.GetPlayer(v)
-- if Player then
-- if (Player.PlayerData.job.name == "police" and Player.PlayerData.job.onduty) then
-- if street2 then
-- TriggerClientEvent("112:client:SendPoliceAlert", v, "flagged", {
-- camId = camId,
-- plate = plate,
-- streetLabel = street1 .. " " .. street2
-- }, blipSettings)
-- else
-- TriggerClientEvent("112:client:SendPoliceAlert", v, "flagged", {
-- camId = camId,
-- plate = plate,
-- streetLabel = street1
-- }, blipSettings)
-- end
-- end
-- end
-- end
-- end)
--[[
RegisterNetEvent('police:server:FlaggedPlateTriggered', function(camId, plate, street1, street2, blipSettings)
local src = source
for k, v in pairs(QBCore.Functions.GetPlayers()) do
local Player = QBCore.Functions.GetPlayer(v)
if Player then
if (Player.PlayerData.job.name == "police" and Player.PlayerData.job.onduty) then
if street2 then
TriggerClientEvent("112:client:SendPoliceAlert", v, "flagged", {
camId = camId,
plate = plate,
streetLabel = street1 .. " " .. street2
}, blipSettings)
else
TriggerClientEvent("112:client:SendPoliceAlert", v, "flagged", {
camId = camId,
plate = plate,
streetLabel = street1
}, blipSettings)
end
end
end
end
end)
]]--

RegisterNetEvent('police:server:SearchPlayer', function(playerId)
local src = source
Expand Down