Update v4.1.2

* Fixed Hotwire Feature
* Fixed that you can still drive with motocycles if engine is off

Author: Musiker15

VERSION

@@ -1 +1 @@
-4.1.1
+4.1.2

client/client.lua

@@ -44,13 +44,11 @@ toggleEngine = function(bypass)
 		return Config.Notification(nil, Translation[Config.Locale]['key_nokey'], 'error')
 	end
 
-	if getVehicleDamaged(currVehicle) then return end
+	if GetVehicleDamaged(currVehicle) then return end
 	local isEngineOn = GetIsVehicleEngineRunning(currVehicle)
 
-	SetVehicleEngineOn(currVehicle, not isEngineOn, false, true)
+	SetEngineState(currVehicle, not isEngineOn, true)
 	SetVehicleKeepEngineOnWhenAbandoned(currVehicle, not isEngineOn)
-	SetVehicleUndriveable(currVehicle, isEngineOn)
-	setEngineState(currVehicle, not isEngineOn)
 
 	if isEngineOn then
 		CreateThread(disableDrive)
@@ -72,12 +70,11 @@ AddEventHandler('msk_enginetoggle:enteringVehicle', function(vehicle, plate, sea
 		logging('SetVehicleUndriveable')
 
 		if not Config.EngineOnAtEnter then
-			SetVehicleUndriveable(vehicle, true)
-			SetVehicleEngineOn(vehicle, false, false, true)
+			SetEngineState(vehicle, false, true)
 			SetVehicleKeepEngineOnWhenAbandoned(vehicle, false)
 		end
 	elseif seat == -1 and isEngineOn and (IsThisModelAHeli(vehicleModel) or IsThisModelAPlane(vehicleModel)) then
-		SetVehicleEngineOn(vehicle, true, false, true)
+		SetEngineState(vehicle, true, true)
 		SetVehicleKeepEngineOnWhenAbandoned(vehicle, true)
 		SetHeliBladesFullSpeed(vehicle)
 	end
@@ -92,17 +89,15 @@ AddEventHandler('msk_enginetoggle:enteredVehicle', function(vehicle, plate, seat
 		logging('SetVehicleUndriveable')
 
 		if not Config.EngineOnAtEnter then
-			CreateThread(disableDrive)
-			SetVehicleUndriveable(vehicle, true)
-			SetVehicleEngineOn(vehicle, false, false, true)
+			SetEngineState(vehicle, false, true)
 			SetVehicleKeepEngineOnWhenAbandoned(vehicle, false)
+			CreateThread(disableDrive)
 		else
-			SetVehicleUndriveable(vehicle, false)
-			SetVehicleEngineOn(vehicle, true, false, true)
+			SetEngineState(vehicle, true, true)
 			SetVehicleKeepEngineOnWhenAbandoned(vehicle, true)
 		end
 	elseif seat == -1 and isEngineOn and (IsThisModelAHeli(vehicleModel) or IsThisModelAPlane(vehicleModel)) then
-		SetVehicleEngineOn(vehicle, true, false, true)
+		SetEngineState(vehicle, true, true)
 		SetVehicleKeepEngineOnWhenAbandoned(vehicle, true)
 		SetHeliBladesFullSpeed(vehicle)
 	end
@@ -115,8 +110,7 @@ AddEventHandler('msk_enginetoggle:exitedVehicle', function(vehicle, plate, seat,
 
 	if seat == -1 and not isEngineOn then
 		logging('SetVehicleUndriveable')
-		SetVehicleUndriveable(vehicle, true)
-		SetVehicleEngineOn(vehicle, false, false, true)
+		SetEngineState(vehicle, false, true)
 		SetVehicleKeepEngineOnWhenAbandoned(vehicle, false)
 	end
 end)
@@ -130,12 +124,12 @@ CreateThread(function()
 		for i = 1, #vehiclePool do
 			local vehicle = vehiclePool[i]
 
-			if DoesEntityExist(vehicle) and not getVehicleDamaged(vehicle) and IsVehicleSeatFree(vehicle, -1) and (not IsPedInAnyVehicle(playerPed, false) or (IsPedInAnyVehicle(playerPed, false) and vehicle ~= GetVehiclePedIsIn(playerPed, false))) then
+			if DoesEntityExist(vehicle) and not GetVehicleDamaged(vehicle) and IsVehicleSeatFree(vehicle, -1) and (not IsPedInAnyVehicle(playerPed, false) or (IsPedInAnyVehicle(playerPed, false) and vehicle ~= GetVehiclePedIsIn(playerPed, false))) then
 				local vehicleModel = GetEntityModel(vehicle)
 
 				if (IsThisModelAHeli(vehicleModel) or IsThisModelAPlane(vehicleModel)) then
-					if getEngineState(vehicle) then
-						SetVehicleEngineOn(vehicle, true, false, true)
+					if GetEngineState(vehicle) then
+						SetEngineState(vehicle, true, true)
 						SetVehicleKeepEngineOnWhenAbandoned(vehicle, true)
 						SetHeliBladesFullSpeed(vehicle)
 					end
@@ -159,8 +153,8 @@ CreateThread(function()
                 local plate = GetVehicleNumberPlateText(vehicle)
                 local seat = GetSeatPedIsTryingToEnter(playerPed)
 				local netId = VehToNet(vehicle)
-				local isEngineOn = getEngineState(vehicle)
-				local isDamaged = getVehicleDamaged(vehicle)
+				local isEngineOn = GetEngineState(vehicle)
+				local isDamaged = GetVehicleDamaged(vehicle)
 				isEnteringVehicle = true
 				TriggerEvent('msk_enginetoggle:enteringVehicle', vehicle, plate, seat, netId, isEngineOn, isDamaged)
                 TriggerServerEvent('msk_enginetoggle:enteringVehicle', plate, seat, netId, isEngineOn, isDamaged)
@@ -175,8 +169,8 @@ CreateThread(function()
 				currentVehicle.plate = GetVehicleNumberPlateText(currentVehicle.vehicle)
 				currentVehicle.seat = GetPedVehicleSeat(playerPed, currentVehicle.vehicle)
 				currentVehicle.netId = VehToNet(currentVehicle.vehicle)
-				currentVehicle.isEngineOn = getEngineState(currentVehicle.vehicle)
-				currentVehicle.isDamaged = getVehicleDamaged(currentVehicle.vehicle)
+				currentVehicle.isEngineOn = GetEngineState(currentVehicle.vehicle)
+				currentVehicle.isDamaged = GetVehicleDamaged(currentVehicle.vehicle)
 				TriggerEvent('msk_enginetoggle:enteredVehicle', currentVehicle.vehicle, currentVehicle.plate, currentVehicle.seat, currentVehicle.netId, currentVehicle.isEngineOn, currentVehicle.isDamaged)
                 TriggerServerEvent('msk_enginetoggle:enteredVehicle', currentVehicle.plate, currentVehicle.seat, currentVehicle.netId,currentVehicle.isEngineOn, currentVehicle.isDamaged)
 			end
@@ -193,59 +187,84 @@ CreateThread(function()
 	end
 end)
 
-setEngineState = function(vehicle, state)
-	logging('setEngineState', vehicle, state)
+SetEngineState = function(vehicle, state, engine)
+	if not DoesEntityExist(vehicle) then return end
+	logging('SetEngineState', vehicle, state)
+
 	currentVehicle.isEngineOn = state
-	Entity(vehicle).state.isEngineOn = state
+	Entity(vehicle).state:set('isEngineOn', state, true)
+
+	if not engine then return end
+	SetVehicleEngineOn(vehicle, state, false, true)
+	SetVehicleUndriveable(vehicle, not state)
 end
+exports('SetEngineState', SetEngineState)
+
+GetEngineState = function(vehicle)
+	if not vehicle then vehicle = GetVehiclePedIsIn(PlayerPedId()) end
+	if not DoesEntityExist(vehicle) then return end
 
-getEngineState = function(vehicle)
 	if Entity(vehicle).state.isEngineOn == nil then
-		Entity(vehicle).state.isEngineOn = GetIsVehicleEngineRunning(vehicle)
+		SetEngineState(vehicle, GetIsVehicleEngineRunning(vehicle), false)
 	end
 	return Entity(vehicle).state.isEngineOn
 end
-exports('getEngineState', getEngineState)
+exports('GetEngineState', GetEngineState)
+exports('getEngineState', GetEngineState) -- Support for old versions
+
+SetVehicleDamaged = function(vehicle, state)
+	if not DoesEntityExist(vehicle) then return end
+	logging('SetVehicleDamaged', vehicle, state)
 
-setVehicleDamaged = function(vehicle, state)
-	logging('setVehicleDamaged', vehicle, state)
 	currentVehicle.isDamaged = state
-	Entity(vehicle).state.isDamaged = state
+	Entity(vehicle).state:set('isDamaged', state, true)
 end
-exports('setVehicleDamaged', setVehicleDamaged)
-RegisterNetEvent('msk_enginetoggle:setVehicleDamaged', setVehicleDamaged)
+exports('SetVehicleDamaged', SetVehicleDamaged)
+exports('setVehicleDamaged', SetVehicleDamaged) -- Support for old versions
+RegisterNetEvent('msk_enginetoggle:setVehicleDamaged', SetVehicleDamaged)
+
+GetVehicleDamaged = function(vehicle)
+	if not vehicle then vehicle = GetVehiclePedIsIn(PlayerPedId()) end
+	if not DoesEntityExist(vehicle) then return end
 
-getVehicleDamaged = function(vehicle)
 	if Entity(vehicle).state.isDamaged == nil then
-		Entity(vehicle).state.isDamaged = false
+		SetVehicleDamaged(vehicle, false)
 	end
 	return Entity(vehicle).state.isDamaged
 end
-exports('getVehicleDamaged', getVehicleDamaged)
+exports('GetVehicleDamaged', GetVehicleDamaged)
+exports('getVehicleDamaged', GetVehicleDamaged) -- Support for old versions
+
+GetPedVehicleSeat = function(playerPed, vehicle)
+	if not playerPed then playerPed = PlayerPedId() end
+	if not vehicle then vehicle = GetVehiclePedIsIn(playerPed) end
+	if not DoesEntityExist(vehicle) then return end
+
+    for i = -1, 16 do
+        if (GetPedInVehicleSeat(vehicle, i) == playerPed) then 
+			return i 
+		end
+    end	
+    return -1
+end
 
 disableDrive = function()
 	if disabledDrive then return end
 	disabledDrive = true
 
-	while isInVehicle and disabledDrive and currentVehicle.seat == -1 and not currentVehicle.isEngineOn do
+	while isInVehicle and disabledDrive and GetPedVehicleSeat() == -1 and not currentVehicle.isEngineOn do
 		local sleep = 1
 
-		DisableControlAction(0, 71, true)
+		DisableControlAction(0, 71, true) -- W
+		DisableControlAction(0, 72, true) -- S
 
 		Wait(sleep)
 	end
 
 	disabledDrive = false
 end
 
-GetPedVehicleSeat = function(ped, vehicle)
-    for i = -1, 16 do
-        if (GetPedInVehicleSeat(vehicle, i) == ped) then return i end
-    end
-    return -1
-end
-
 logging = function(...)
 	if not Config.Debug then return end
-	print('[DEBUG]', ...)
+	print('[^3DEBUG^0]', ...)
 end

config.lua

@@ -45,7 +45,7 @@ Config.EngineFromSecondSeat = false
 -- vehicle_keys: https://forum.cfx.re/t/esx-qbcore-vehicles-keys-vehicles-lock-remote-control-ui-and-much-more/4857274
 
 Config.VehicleKeys = {
-    enable = false,
+    enable = false, -- Set true to enable this feature
     script = 'VehicleKeyChain' -- Set to 'VehicleKeyChain' or 'vehicle_keys'
 }
 ----------------------------------------------------------------

fxmanifest.lua

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

server/server_hotwire.lua

@@ -1,12 +1,12 @@
 if Config.EnableLockpick then
     if Config.Framework == 'ESX' then
 		ESX.RegisterUsableItem(Config.LockpickSettings.item, function(source)
-			TriggerClientEvent('msk_enginetoggle:hotwire', source)
+			TriggerClientEvent('msk_enginetoggle:toggleHotwire', source)
 		end)
 
         ESX.RegisterServerCallback('msk_enginetoggle:hasItem', function(source, cb, item)
             local src = source
-            local xPlayer = ESX.getPlayerFromId(src)
+            local xPlayer = ESX.GetPlayerFromId(src)
             local hasItem = xPlayer.hasItem(item)
 
             if hasItem and hasItem.count > 0 then
@@ -17,7 +17,7 @@ if Config.EnableLockpick then
         end)
     elseif Config.Framework == 'QBCore' then
         QBCore.Functions.CreateUseableItem(Config.LockpickSettings.item, function(source)
-            TriggerClientEvent('msk_enginetoggle:hotwire', source)
+            TriggerClientEvent('msk_enginetoggle:toggleHotwire', source)
         end)
 
         QBCore.Functions.CreateCallback('msk_enginetoggle:hasItem', function(source, cb, item)
@@ -36,8 +36,8 @@ if Config.EnableLockpick then
     end
 
 	RegisterNetEvent('msk_enginetoggle:removeLockpickItem', function()
-        local src = source
         if not Config.LockpickSettings.removeItem then return end
+        local src = source
 
         if Config.Framework == 'ESX' then
             local xPlayer = ESX.GetPlayerFromId(src)