Update v4.2.3

Author: Musiker15

VERSION

@@ -1 +1 @@
-4.2.2
+4.2.3

client/hotwire.lua

@@ -235,6 +235,7 @@ local activeBlips = {}
 deleteVehicleBlip = function(netId)
 	if not activeBlips[netId] then return end
 	RemoveBlip(activeBlips[netId].blip)
+	activeBlips[netId] = nil
 end
 RegisterNetEvent('msk_enginetoggle:deleteVehicleBlip', deleteVehicleBlip)
 
@@ -265,22 +266,28 @@ showVehicleBlip = function(netId, coords)
 		activeBlips[netId].isActive = false
 		ShowHeadingIndicatorOnBlip(activeBlips[netId].blip, false)
 		SetBlipCoords(activeBlips[netId].blip, coords.x, coords.y, coords.z)
-	elseif OneSync and not activeBlips[netId].isActive then
+	elseif OneSync and activeBlips[netId] and not activeBlips[netId].isActive then
 		CreateThread(function()
 			activeBlips[netId].isActive = true
 
-			while activeBlips[netId] and activeBlips[netId].isActive and DoesEntityExist(OneSync.vehicle) do
-				local vehicleCoords = GetEntityCoords(OneSync.vehicle)
-				local heading = math.ceil(GetEntityHeading(OneSync.vehicle))
-
-				SetBlipCoords(activeBlips[netId].blip, vehicleCoords.x, vehicleCoords.y, vehicleCoords.z)
-				ShowHeadingIndicatorOnBlip(activeBlips[netId].blip, true)
-				SetBlipRotation(activeBlips[netId].blip, heading)
+			while activeBlips[netId] and activeBlips[netId].isActive do
+				if DoesEntityExist(OneSync.vehicle) then
+					local vehicleCoords = GetEntityCoords(OneSync.vehicle)
+					local heading = math.ceil(GetEntityHeading(OneSync.vehicle))
+
+					SetBlipCoords(activeBlips[netId].blip, vehicleCoords.x, vehicleCoords.y, vehicleCoords.z)
+					ShowHeadingIndicatorOnBlip(activeBlips[netId].blip, true)
+					SetBlipRotation(activeBlips[netId].blip, heading)
+				else
+					deleteVehicleBlip(netId)
+					break
+				end
 			end
 		end)
 	end
 
 	SetTimeout(2500, function()
+		if not activeBlips[netId] then return end
 		showVehicleBlip(netId, coords)
 	end)
 end

client/main.lua

@@ -291,6 +291,6 @@ disableDrive = function()
 end
 
 logging = function(code, ...)
-	if not Config.Debug then return end
-	MSK.Logging(code, ...)
+    if code == 'debug' and not Config.Debug then return end
+    MSK.Logging(code, ...)
 end

client/vehiclekeys.lua

@@ -58,6 +58,8 @@ getIsKeyOwner = function(vehicle)
             isKeyOwner = exports["vehicle_keys"]:doesPlayerOwnPlate(plate)
         elseif Config.VehicleKeys.script == 'wasabi_carlock' and (GetResourceState("wasabi_carlock") == "started") then
             isKeyOwner = exports.wasabi_carlock:HasKey(plate)
+        elseif Config.VehicleKeys.script == 'qs-vehiclekeys' and (GetResourceState("qs-vehiclekeys") == "started") then
+            isKeyOwner = exports['qs-vehiclekeys']:GetKey(plate)
         else
             -- Add your own code here
         end

config.lua

@@ -48,7 +48,7 @@ Config.EngineFromSecondSeat = false
 Config.VehicleKeys = {
     enable = true, -- Set true to enable this feature
 
-    -- Supported Scripts: 'msk_vehiclekeys', 'VehicleKeyChain', 'vehicle_keys', 'okokGarage', 'wasabi_carlock'
+    -- Supported Scripts: 'msk_vehiclekeys', 'VehicleKeyChain', 'vehicle_keys', 'okokGarage', 'wasabi_carlock', 'qs-vehiclekeys'
     script = 'msk_vehiclekeys',
 
     -- This is for inventories with metadata like ox_inventory

fxmanifest.lua

@@ -4,7 +4,7 @@ games { 'gta5' }
 author 'Musiker15 - MSK Scripts'
 name 'msk_enginetoggle'
 description 'EngineToggle for Vehicles'
-version '4.2.2'
+version '4.2.3'
 
 lua54 'yes'
 

server/hotwire.lua

@@ -99,14 +99,14 @@ RegisterNetEvent('msk_enginetoggle:saveAlarmStage', function(plate, stage)
 
     local result = MySQL.query.await(('SELECT * FROM %s WHERE %s = @owner AND plate = @plate'):format(VEHICLE_TABLE_NAME, OWNER_COLUMN_NAME), {
 		['@owner'] = identifier,
-		['@plate'] = trim(plate)
+		['@plate'] = MSK.Trim(plate, true)
 	})
 
 	if result and result[1] and result[1][OWNER_COLUMN_NAME] == identifier then
 		MySQL.update(('UPDATE %s SET alarmStage = @alarmStage WHERE %s = @owner AND plate = @plate'):format(VEHICLE_TABLE_NAME, OWNER_COLUMN_NAME), {
             ['@alarmStage'] = stage,
             ['@owner'] = identifier,
-            ['@plate'] = trim(plate),
+            ['@plate'] = MSK.Trim(plate, true),
         })
     else
         Config.Notification(playerId, Translation[Config.Locale]['not_vehicle_owner'], 'error')

server/main.lua

@@ -140,4 +140,9 @@ MSK.Register('msk_enginetoggle:getInventory', function(source, inv)
 
 	local invName = ('content-%s'):format(identifier):gsub(':', '')
 	return exports['core_inventory']:getInventory(invName)
-end)
+end)
+
+logging = function(code, ...)
+    if code == 'debug' and not Config.Debug then return end
+    MSK.Logging(code, ...)
+end

server/versionchecker.lua

@@ -7,7 +7,7 @@ local GITHUB_URL        = "https://api.github.com/repos/%s/%s/releases/latest"
 local DOWNLOAD_URL      = "https://github.com/%s/%s/releases/tag/v%s"
 
 local RENAME_WARNING    = NAME_COLORED .. "^3 [WARNING] This resource should not be renamed! This can lead to errors. Please rename it to^0 %s"
-local CHECK_FAILED		= NAME_COLORED .. "^1 [ERROR] Version Check failed! Http Error: %s^0\n^3Please update to the latest version.^0"
+local CHECK_FAILED		= NAME_COLORED .. "^1 [ERROR] Version Check failed! Http Error: %s ^3Please update to the latest version.^0"
 local BETA_VERSION      = NAME_COLORED .. "^3 [WARNING] Beta version detected^0 - ^5Current Version:^0 %s - ^5Latest Version:^0 %s"
 local UP_TO_DATE        = NAME_COLORED .. "^2 ✓ Resource is Up to Date^0 - ^5Current Version:^2 %s ^0"
 local NEW_VERSION       = NAME_COLORED .. "^3 [Update Available] ^5Current Version:^0 %s - ^5Latest Version:^0 %s\n" .. NAME_COLORED .. "^5 Download:^4 %s ^0"