Merge branch 'main' into main

client/events.lua

@@ -160,6 +160,12 @@ end)
 
 RegisterNetEvent('QBCore:Client:VehicleInfo', function(info)
     local plate = QBCore.Functions.GetPlate(info.vehicle)
+    local hasKeys = true
+
+    if GetResourceState('qb-vehiclekeys') == 'started' then
+        hasKeys = exports['qb-vehiclekeys']:HasKeys()
+    end
+
     local data = {
         vehicle = info.vehicle,
         seat = info.seat,
@@ -167,8 +173,9 @@ RegisterNetEvent('QBCore:Client:VehicleInfo', function(info)
         plate = plate,
         driver = GetPedInVehicleSeat(info.vehicle, -1),
         inseat = GetPedInVehicleSeat(info.vehicle, info.seat),
-        haskeys = exports['qb-vehiclekeys']:HasKeys(plate)
+        haskeys = hasKeys
     }
+
     TriggerEvent('QBCore:Client:'..info.event..'Vehicle', data)
 end)
 

fxmanifest.lua

@@ -2,7 +2,7 @@ fx_version 'cerulean'
 game 'gta5'
 
 description 'QB-Core'
-version '1.2.1'
+version '1.2.2'
 
 shared_scripts {
     'config.lua',

server/functions.lua

@@ -414,3 +414,16 @@ end
 function QBCore.Functions.Notify(source, text, type, length)
     TriggerClientEvent('QBCore:Notify', source, text, type, length)
 end
+
+--- SQL Pattern Matching
+function QBCore.Functions.PrepForSQL(source,data,pattern)
+    data = tostring(data)
+    local src = source
+    local player = QBCore.Functions.GetPlayer(src)
+    local result = string.match(data, pattern)
+    if not result or string.len(result) ~= string.len(data)  then
+        TriggerEvent('qb-log:server:CreateLog', 'anticheat', 'SQL Exploit Attempted', 'red', string.format('%s attempted to exploit SQL!', player.PlayerData.license))
+        return false
+    end
+    return true
+end

shared/vehicles.lua

@@ -4991,7 +4991,7 @@ QBShared.Vehicles = {
     ['rhinehart'] = {
         ['name'] = 'Rhinehart',
         ['brand'] = 'Übermacht',
-        ['model'] = 'rhinehart ',
+        ['model'] = 'rhinehart',
         ['price'] = 105000,
         ['category'] = 'sedans',
         ['categoryLabel'] = 'Sedans',