From 24779ed578caef48f02a229a04ba9ebaaf6b697c Mon Sep 17 00:00:00 2001 From: Miho Date: Tue, 24 Jun 2025 23:33:18 +0200 Subject: [PATCH 1/4] resources/[jobs]/[civ]/mh_jobgarage/client/chiefsettings.lua aktualisiert --- resources/[jobs]/[civ]/mh_jobgarage/client/chiefsettings.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/[jobs]/[civ]/mh_jobgarage/client/chiefsettings.lua b/resources/[jobs]/[civ]/mh_jobgarage/client/chiefsettings.lua index 9edb5c769..9f30c1e16 100644 --- a/resources/[jobs]/[civ]/mh_jobgarage/client/chiefsettings.lua +++ b/resources/[jobs]/[civ]/mh_jobgarage/client/chiefsettings.lua @@ -47,7 +47,7 @@ function OpenChiefAddVehicleMenu() local opt = {} for i = 1, #vehicles, 1 do - local isSpawned, mods = IsVehicleSpawned(plate) + local isSpawned, mods = IsVehicleSpawned(vehicles[i].plate) while not isSpawned do Wait(100) end From cbdc3609b86ef562ca83b272540e8e4680b27e96 Mon Sep 17 00:00:00 2001 From: Miho Date: Tue, 24 Jun 2025 23:36:02 +0200 Subject: [PATCH 2/4] resources/[jobs]/[civ]/mh_jobgarage/client/chiefsettings.lua aktualisiert --- .../mh_jobgarage/client/chiefsettings.lua | 74 ++++++++++--------- 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/resources/[jobs]/[civ]/mh_jobgarage/client/chiefsettings.lua b/resources/[jobs]/[civ]/mh_jobgarage/client/chiefsettings.lua index 9f30c1e16..3db7e0f4f 100644 --- a/resources/[jobs]/[civ]/mh_jobgarage/client/chiefsettings.lua +++ b/resources/[jobs]/[civ]/mh_jobgarage/client/chiefsettings.lua @@ -48,47 +48,49 @@ function OpenChiefAddVehicleMenu() for i = 1, #vehicles, 1 do local isSpawned, mods = IsVehicleSpawned(vehicles[i].plate) - while not isSpawned do - Wait(100) - end - print("Chiefsettings: "..mods) + + if isSpawned then + print("Chiefsettings: "..mods) - table.insert(opt, { - title = "Kennzeichen: "..mods.plate, - description = "Deine Ersatzschlüssel: "..vehicles[i].keys, - icon = 'car', - onSelect = function() - local value = lib.inputDialog("Schlüsselkasten", { - {type = "input", label = "Anzeigename", description = "Anzeigename wie die anderen den sehen!"}, - {type = "number", label = "Schlüsselanzahl", description = "Anzahl der Ersatzschlüssel.", min = 1, max = vehicles[i].keys}, - {type = "number", label = "Rang", description = "Ab welchen Rang darf man das Fahrzeug Fahren?"} - }) + table.insert(opt, { + title = "Kennzeichen: "..mods.plate, + description = "Deine Ersatzschlüssel: "..vehicles[i].keys, + icon = 'car', + onSelect = function() + local value = lib.inputDialog("Schlüsselkasten", { + {type = "input", label = "Anzeigename", description = "Anzeigename wie die anderen den sehen!"}, + {type = "number", label = "Schlüsselanzahl", description = "Anzahl der Ersatzschlüssel.", min = 1, max = vehicles[i].keys}, + {type = "number", label = "Rang", description = "Ab welchen Rang darf man das Fahrzeug Fahren?"} + }) - QBCore.Functions.TriggerCallback('mh_jobgarage:AddVehicleToJob', function(cb) - if cb.status then - Notification("Schlüsselkasten", cb.text, cb.type) - lib.hideContext('ChiefAddVehicleMenu') - QBCore.Functions.TriggerCallback('mh_jobgarage:CallVehiclesInfo', function(cb) - OpenMenu(cb) - end, Player.job.name) - else - Notification("Schlüsselkasten", cb.text, cb.type) - if cb.key then - SetNewWaypoint(Config.KeyMaker.x, Config.KeyMaker.y) + QBCore.Functions.TriggerCallback('mh_jobgarage:AddVehicleToJob', function(cb) + if cb.status then + Notification("Schlüsselkasten", cb.text, cb.type) + lib.hideContext('ChiefAddVehicleMenu') + QBCore.Functions.TriggerCallback('mh_jobgarage:CallVehiclesInfo', function(cb) + OpenMenu(cb) + end, Player.job.name) + else + Notification("Schlüsselkasten", cb.text, cb.type) + if cb.key then + SetNewWaypoint(Config.KeyMaker.x, Config.KeyMaker.y) + end end - end - end, mods.plate, value) - end - }) + end, mods.plate, value) + end + }) - lib.registerContext({ - id = "ChiefAddVehicleMenu", - title = "Schlüsselkasten", - description = "Füge ein Fahrzeug hinzu.", - options = opt - }) + lib.registerContext({ + id = "ChiefAddVehicleMenu", + title = "Schlüsselkasten", + description = "Füge ein Fahrzeug hinzu.", + options = opt + }) - lib.showContext("ChiefAddVehicleMenu") + lib.showContext("ChiefAddVehicleMenu") + else + Notification("Schlüsselkasten", "Kein Fahrzeug gefunden!", "warning") + end end else Notification("Schlüsselkasten", "Keine Fahrzeuge von dir Gefunden!", "error") From de57457b8f3df41c38a187e49a8aa2c872572e26 Mon Sep 17 00:00:00 2001 From: Miho Date: Tue, 24 Jun 2025 23:37:54 +0200 Subject: [PATCH 3/4] resources/[jobs]/[civ]/mh_jobgarage/client/function.lua aktualisiert --- .../[civ]/mh_jobgarage/client/function.lua | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/resources/[jobs]/[civ]/mh_jobgarage/client/function.lua b/resources/[jobs]/[civ]/mh_jobgarage/client/function.lua index 9001d511b..2f4d3fe38 100644 --- a/resources/[jobs]/[civ]/mh_jobgarage/client/function.lua +++ b/resources/[jobs]/[civ]/mh_jobgarage/client/function.lua @@ -27,23 +27,4 @@ end RegisterNetEvent('mh_jobgarage:notify') AddEventHandler('mh_jobgarage:notify', function(title, text, type) Notification(title, text, type) -end) - -function IsVehicleSpawned(plate) - - local vehicles = GetGamePool('CVehicle') - - for _, vehicle in ipairs(vehicles) do - if DoesEntityExist(vehicle) then - local mods = QBCore.Functions.GetVehicleProperties(vehicle) - local vehiclePlate = mods.plate - - if vehiclePlate == plate then - print("Function: "..mods) - return true, mods - end - end - end - - return false, nil -- Vehicle not found -end \ No newline at end of file +end) \ No newline at end of file From 15bed7d09ffba9673c84843347edbc8fa91de99f Mon Sep 17 00:00:00 2001 From: Miho Date: Tue, 24 Jun 2025 23:38:24 +0200 Subject: [PATCH 4/4] resources/[jobs]/[civ]/mh_jobgarage/client/chiefsettings.lua aktualisiert --- .../mh_jobgarage/client/chiefsettings.lua | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/resources/[jobs]/[civ]/mh_jobgarage/client/chiefsettings.lua b/resources/[jobs]/[civ]/mh_jobgarage/client/chiefsettings.lua index 3db7e0f4f..b3607b664 100644 --- a/resources/[jobs]/[civ]/mh_jobgarage/client/chiefsettings.lua +++ b/resources/[jobs]/[civ]/mh_jobgarage/client/chiefsettings.lua @@ -36,6 +36,26 @@ function OpenChiefMenu(vehicles) lib.showContext("ChiefSettingsMenu") end + +function IsVehicleSpawned(plate) + + local vehicles = GetGamePool('CVehicle') + + for _, vehicle in ipairs(vehicles) do + if DoesEntityExist(vehicle) then + local mods = QBCore.Functions.GetVehicleProperties(vehicle) + local vehiclePlate = mods.plate + + if vehiclePlate == plate then + print("Function: "..mods) + return true, mods + end + end + end + + return false, nil -- Vehicle not found +end + function OpenChiefAddVehicleMenu() local Player = QBCore.Functions.GetPlayerData() local opt = {}