diff --git a/resources/[cars]/rs666/data/vehicles.meta b/resources/[cars]/rs666/data/vehicles.meta index 59fe451d0..1343ecb01 100644 --- a/resources/[cars]/rs666/data/vehicles.meta +++ b/resources/[cars]/rs666/data/vehicles.meta @@ -15,7 +15,7 @@ null null - audr8tteng + taaud40v8 LAYOUT_STANDARD SCHAFTER_COVER_OFFSET_INFO EXPLOSION_INFO_DEFAULT diff --git a/resources/[carscripts]/mh_garage/client/retrieve.lua b/resources/[carscripts]/mh_garage/client/retrieve.lua index 93f618ca6..495010754 100644 --- a/resources/[carscripts]/mh_garage/client/retrieve.lua +++ b/resources/[carscripts]/mh_garage/client/retrieve.lua @@ -9,16 +9,18 @@ AddEventHandler('mh_garage:retrieveVehicle', function() QBCore.Functions.TriggerCallback('mh_garage:CallVehicles', function(cb) Debug(json.encode(cb)) for i = 1, #cb, 1 do - local mods = json.decode(cb[i].mods) - table.insert(opt, { - title = cb[i].name, - description = "Kennzeichen: "..cb[i].plate.."\nTankinhalt: "..math.round(mods.fuelLevel, 2).."%", - icon = "car", - onSelect = function() - cb[i].mods = mods - SpawnThisVehicle(cb[i]) - end - }) + if cb[i].garage ~= "OUT" then + local mods = json.decode(cb[i].mods) + table.insert(opt, { + title = cb[i].name, + description = "Kennzeichen: "..cb[i].plate.."\nTankinhalt: "..math.round(mods.fuelLevel, 2).."%", + icon = "car", + onSelect = function() + cb[i].mods = mods + SpawnThisVehicle(cb[i]) + end + }) + end end lib.registerContext({ diff --git a/resources/[carscripts]/mh_garage/server/server.lua b/resources/[carscripts]/mh_garage/server/server.lua index 50d96940a..69e200d12 100644 --- a/resources/[carscripts]/mh_garage/server/server.lua +++ b/resources/[carscripts]/mh_garage/server/server.lua @@ -31,7 +31,7 @@ QBCore.Functions.CreateCallback('mh_garage:storedVehicle', function(source, cb, if Player.Functions.GetMoney('bank', zone.price) then MySQL.query("SELECT * FROM player_vehicles WHERE citizenid = ? AND plate = ?", {Player.PlayerData.citizenid, veh.plate}, function(rs) if rs[1] ~= nil then - MySQL.query("UPDATE player_vehicles SET garage = ?, parking = ?, mods = ? WHERE plate = ?", {zone.name, true, json.encode(veh), veh.plate}) + MySQL.query("UPDATE player_vehicles SET garage = ?, mods = ? WHERE plate = ?", {zone.name, json.encode(veh), veh.plate}) DelVehParking(veh.plate) cb({ status = true, @@ -43,7 +43,7 @@ QBCore.Functions.CreateCallback('mh_garage:storedVehicle', function(source, cb, else MySQL.query("SELECT * FROM vehicle_keys WHERE owner = ? AND plate = ?", {Player.PlayerData.citizenid, veh.plate}, function(rs) if rs[1] ~= nil then - MySQL.query("UPDATE player_vehicles SET garage = ?, parking = ? WHERE plate = ?", {zone.name, true, veh.plate}) + MySQL.query("UPDATE player_vehicles SET garage = ?, mods = ? WHERE plate = ?", {zone.name, json.encode(veh), veh.plate}) --TriggerEvent('mh_Parking:removeVehicle', source, veh.plate) --DelVehParking(veh.plate) cb({ @@ -147,5 +147,5 @@ end) RegisterServerEvent('mh_garage:spawnedVehicle') AddEventHandler('mh_garage:spawnedVehicle', function(netID, plate) - MySQL.query("UPDATE player_vehicles SET parking = ? WHERE plate = ?", {0, plate}) + MySQL.query("UPDATE player_vehicles SET garage = ? WHERE plate = ?", {"OUT", plate}) end) \ No newline at end of file diff --git a/resources/[carscripts]/sn_vehicleKey/client.lua b/resources/[carscripts]/sn_vehicleKey/client.lua index a261f6985..6f76d8b4a 100644 --- a/resources/[carscripts]/sn_vehicleKey/client.lua +++ b/resources/[carscripts]/sn_vehicleKey/client.lua @@ -803,5 +803,8 @@ local entityEnumerator = { RegisterKeyMapping("vehicleLock", "Vehicle Lock", "keyboard", "PAGEUP") RegisterCommand("vehicleLock", function() - TriggerEvent("VKC:toggleLockOnPlayer") + local vehicle = GetClosestVehicle(GetEntityCoords(PlayerPedId()), 10.0) + if (DoesEntityExist(vehicle) and IsVehicleOrKeyOwner(vehicle)) then + ToggleLock(vehicle, GetVehicleDoorLockStatus(vehicle) ~= LockStatus.Locked) + end end, false) \ No newline at end of file