From 2b2fd455dc927ce2a67256fcb96af32bdfe3f49a Mon Sep 17 00:00:00 2001 From: Miho931 <98314142+Miho931@users.noreply.github.com> Date: Wed, 25 Jun 2025 20:39:42 +0200 Subject: [PATCH 1/6] add GARAGE func --- resources/[carscripts]/mh_garage/client/retrieve.lua | 2 +- resources/[carscripts]/mh_garage/server/server.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/[carscripts]/mh_garage/client/retrieve.lua b/resources/[carscripts]/mh_garage/client/retrieve.lua index 48cd83ad2..a86264a7d 100644 --- a/resources/[carscripts]/mh_garage/client/retrieve.lua +++ b/resources/[carscripts]/mh_garage/client/retrieve.lua @@ -24,7 +24,7 @@ AddEventHandler('mh_garage:retrieveOwnerVehicle', function() end }) end - end) + end, CurrentZone.name) end) RegisterNetEvent('mh_garage:retrieveVehicle') diff --git a/resources/[carscripts]/mh_garage/server/server.lua b/resources/[carscripts]/mh_garage/server/server.lua index 9b1b74e82..62dce934a 100644 --- a/resources/[carscripts]/mh_garage/server/server.lua +++ b/resources/[carscripts]/mh_garage/server/server.lua @@ -107,7 +107,7 @@ QBCore.Functions.CreateCallback('mh_garage:retrieveKeyVehicle', function(source, local pedid = Player.PlayerData.citizenid local veh = {} - MySQL.query("SELECT pv.* FROM player_vehicles pv JOIN vehicle_keys vk ON pv.plate = vk.plate WHERE vk.owner = ? AND vk.count > 0", {playerId}, function(vehicles) + MySQL.query("SELECT pv.* FROM player_vehicles pv JOIN vehicle_keys vk ON pv.plate = vk.plate WHERE vk.owner = ? AND vk.count > 0 AND pv.garage = ?", {pedid, zone}, function(vehicles) if vehicles and #vehicles > 0 then for _, vehicle in pairs(vehicles) do table.insert(veh, { From a46b5450b718e947db98ae1040fd4f6e58d91c9c Mon Sep 17 00:00:00 2001 From: Miho931 <98314142+Miho931@users.noreply.github.com> Date: Wed, 25 Jun 2025 20:41:13 +0200 Subject: [PATCH 2/6] Update server.lua --- resources/[carscripts]/mh_garage/server/server.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/[carscripts]/mh_garage/server/server.lua b/resources/[carscripts]/mh_garage/server/server.lua index 62dce934a..5b0fe9bf2 100644 --- a/resources/[carscripts]/mh_garage/server/server.lua +++ b/resources/[carscripts]/mh_garage/server/server.lua @@ -83,7 +83,7 @@ QBCore.Functions.CreateCallback('mh_garage:retrieveOwnerVehicle', function(sourc local pedid = Player.PlayerData.citizenid local veh = {} - MySQL.query("SELECT * FROM player_vehicles WHERE owner = ? and garage = ?", {pedid, zone}, function(rs) + MySQL.query("SELECT * FROM player_vehicles WHERE citizenid = ? and garage = ?", {pedid, zone}, function(rs) if rs ~= nil and rs[1] ~= nil then for k, v in pairs (rs) do table.insert(veh, { From 0fe9c9b6596c313cc355d497f8afae04f880e635 Mon Sep 17 00:00:00 2001 From: Miho931 <98314142+Miho931@users.noreply.github.com> Date: Wed, 25 Jun 2025 20:42:53 +0200 Subject: [PATCH 3/6] Update retrieve.lua --- resources/[carscripts]/mh_garage/client/retrieve.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/[carscripts]/mh_garage/client/retrieve.lua b/resources/[carscripts]/mh_garage/client/retrieve.lua index a86264a7d..2de75625b 100644 --- a/resources/[carscripts]/mh_garage/client/retrieve.lua +++ b/resources/[carscripts]/mh_garage/client/retrieve.lua @@ -36,7 +36,11 @@ AddEventHandler('mh_garage:retrieveVehicle', function() local opt = {} QBCore.Functions.TriggerCallback('mh_garage:retrieveKeyVehicle', function(cb) - Debug(json.encode(cb)) + if cb == false then + Notification("Es ist kein Fahrzeug hier!", "inform") + return + end + for i = 1, #cb, 1 do if cb[i].garage ~= "OUT" then local mods = json.decode(cb[i].mods) From 99e14014b47cd2967de10b7c9f76e8ffc48fccdb Mon Sep 17 00:00:00 2001 From: Miho931 <98314142+Miho931@users.noreply.github.com> Date: Wed, 25 Jun 2025 20:44:52 +0200 Subject: [PATCH 4/6] Update retrieve.lua --- resources/[carscripts]/mh_garage/client/retrieve.lua | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/resources/[carscripts]/mh_garage/client/retrieve.lua b/resources/[carscripts]/mh_garage/client/retrieve.lua index 2de75625b..595294e6d 100644 --- a/resources/[carscripts]/mh_garage/client/retrieve.lua +++ b/resources/[carscripts]/mh_garage/client/retrieve.lua @@ -24,6 +24,13 @@ AddEventHandler('mh_garage:retrieveOwnerVehicle', function() end }) end + lib.registerContext({ + id = "retrieveVehicle", + title = random.name, + options = opt + }) + + lib.showContext("retrieveVehicle") end, CurrentZone.name) end) @@ -40,7 +47,7 @@ AddEventHandler('mh_garage:retrieveVehicle', function() Notification("Es ist kein Fahrzeug hier!", "inform") return end - + for i = 1, #cb, 1 do if cb[i].garage ~= "OUT" then local mods = json.decode(cb[i].mods) From 0d017263e46cb2037036770a4cce3505d05ad48d Mon Sep 17 00:00:00 2001 From: Miho931 <98314142+Miho931@users.noreply.github.com> Date: Wed, 25 Jun 2025 20:49:36 +0200 Subject: [PATCH 5/6] Update main.lua --- resources/[carscripts]/mh_garage/client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/[carscripts]/mh_garage/client/main.lua b/resources/[carscripts]/mh_garage/client/main.lua index 7e8e24300..8f9bda9a4 100644 --- a/resources/[carscripts]/mh_garage/client/main.lua +++ b/resources/[carscripts]/mh_garage/client/main.lua @@ -124,7 +124,7 @@ function AddTargetOptions() { type = "client", event = "mh_garage:retrieveVehicle", - icon = "fas fa-car", + icon = "key", label = "Schlüssel Fahrzeug ausparken", } } From f18755d71a2e8d05d30251621de731d13fdac6ed Mon Sep 17 00:00:00 2001 From: Miho931 <98314142+Miho931@users.noreply.github.com> Date: Wed, 25 Jun 2025 21:01:13 +0200 Subject: [PATCH 6/6] Update stored.lua --- resources/[carscripts]/mh_garage/client/stored.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/[carscripts]/mh_garage/client/stored.lua b/resources/[carscripts]/mh_garage/client/stored.lua index d0689d229..d52641efe 100644 --- a/resources/[carscripts]/mh_garage/client/stored.lua +++ b/resources/[carscripts]/mh_garage/client/stored.lua @@ -9,7 +9,7 @@ AddEventHandler('mh_garage:storeVehicle', function() for i = 1, #vehicles, 1 do local veh_coords = GetEntityCoords(vehicles[i]) local distance = #(veh_coords - coords) - if distance < 10.0 then + if distance < 15.0 then local mods = QBCore.Functions.GetVehicleProperties(vehicles[i]) local lc_fuelLevel = exports["lc_fuel"]:GetFuel(vehicles[i]) -- Get the fuel level