Skip to content

Commit 87ec02a

Browse files
committed
Update v4.2.0
1 parent f9a44f4 commit 87ec02a

11 files changed

+687
-267
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.1.5
1+
4.2.0

client/client.lua

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ if Config.Framework == 'ESX' then
22
ESX = exports["es_extended"]:getSharedObject()
33
elseif Config.Framework == 'QBCore' then
44
QBCore = exports['qb-core']:GetCoreObject()
5-
elseif Config.Framework == 'Standalone' then
5+
else
66
-- Add your own code here
77
end
88

@@ -118,7 +118,15 @@ CreateThread(function()
118118
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
119119
local vehicleModel = GetEntityModel(vehicle)
120120

121-
if (IsThisModelAHeli(vehicleModel) or IsThisModelAPlane(vehicleModel)) then
121+
if IsThisModelACar(vehicleModel) then
122+
local steeringAngle = GetSteeringAngle(vehicle)
123+
124+
if steeringAngle and steeringAngle ~= GetVehicleSteeringAngle(vehicle) then
125+
SetSteeringAngle(vehicle, steeringAngle)
126+
end
127+
end
128+
129+
if IsThisModelAHeli(vehicleModel) or IsThisModelAPlane(vehicleModel) then
122130
if GetEngineState(vehicle) then
123131
SetEngineState(vehicle, true, true)
124132
SetHeliBladesFullSpeed(vehicle)
@@ -162,7 +170,7 @@ CreateThread(function()
162170
currentVehicle.isEngineOn = GetEngineState(currentVehicle.vehicle)
163171
currentVehicle.isDamaged = GetVehicleDamaged(currentVehicle.vehicle)
164172
TriggerEvent('msk_enginetoggle:enteredVehicle', currentVehicle.vehicle, currentVehicle.plate, currentVehicle.seat, currentVehicle.netId, currentVehicle.isEngineOn, currentVehicle.isDamaged)
165-
TriggerServerEvent('msk_enginetoggle:enteredVehicle', currentVehicle.plate, currentVehicle.seat, currentVehicle.netId,currentVehicle.isEngineOn, currentVehicle.isDamaged)
173+
TriggerServerEvent('msk_enginetoggle:enteredVehicle', currentVehicle.plate, currentVehicle.seat, currentVehicle.netId, currentVehicle.isEngineOn, currentVehicle.isDamaged)
166174
end
167175
elseif isInVehicle then
168176
if not IsPedInAnyVehicle(playerPed, false) or IsPlayerDead(PlayerId()) then
@@ -187,6 +195,10 @@ SetEngineState = function(vehicle, state, engine)
187195
SetVehicleUndriveable(vehicle, not state)
188196
SetVehicleKeepEngineOnWhenAbandoned(vehicle, state)
189197

198+
if state then
199+
SetSteeringAngle(vehicle, 0.0)
200+
end
201+
190202
if not engine then return end
191203
SetVehicleEngineOn(vehicle, state, false, true)
192204
end
@@ -207,7 +219,6 @@ exports('getEngineState', GetEngineState) -- Support for old versions
207219

208220
SetVehicleDamaged = function(vehicle, state)
209221
assert(vehicle and DoesEntityExist(vehicle), 'Parameter "vehicle" is nil or the Vehicle does not exist on function SetVehicleDamaged')
210-
logging('SetVehicleDamaged', vehicle, state)
211222

212223
currentVehicle.isDamaged = state
213224
Entity(vehicle).state:set('isDamaged', state, true)
@@ -241,7 +252,7 @@ exports('getVehicleDamaged', GetVehicleDamaged) -- Support for old versions
241252

242253
GetPedVehicleSeat = function(playerPed, vehicle)
243254
if not playerPed then playerPed = PlayerPedId() end
244-
if not vehicle then vehicle = GetVehiclePedIsIn(playerPed) end
255+
if not vehicle then vehicle = currentVehicle and currentVehicle.vehicle or GetVehiclePedIsIn(playerPed) end
245256
assert(vehicle and DoesEntityExist(vehicle), 'Parameter "vehicle" is nil or the Vehicle does not exist on function GetPedVehicleSeat')
246257

247258
for i = -1, 16 do

0 commit comments

Comments
 (0)