mirror of
https://github.com/esx-framework/esx_core.git
synced 2026-09-04 16:23:21 +00:00
fix(client/modules/actions.lua): check if vehicle changed
This commit is contained in:
@@ -59,6 +59,7 @@ CreateThread(function()
|
|||||||
TriggerEvent("esx:pauseMenuActive", inPauseMenu)
|
TriggerEvent("esx:pauseMenuActive", inPauseMenu)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local tempVehicle = GetVehiclePedIsUsing(playerPed)
|
||||||
if not isInVehicle and not IsPlayerDead(PlayerId()) then
|
if not isInVehicle and not IsPlayerDead(PlayerId()) then
|
||||||
if DoesEntityExist(GetVehiclePedIsTryingToEnter(playerPed)) and not isEnteringVehicle then
|
if DoesEntityExist(GetVehiclePedIsTryingToEnter(playerPed)) and not isEnteringVehicle then
|
||||||
-- trying to enter a vehicle!
|
-- trying to enter a vehicle!
|
||||||
@@ -80,7 +81,7 @@ CreateThread(function()
|
|||||||
-- suddenly appeared in a vehicle, possible teleport
|
-- suddenly appeared in a vehicle, possible teleport
|
||||||
isEnteringVehicle = false
|
isEnteringVehicle = false
|
||||||
isInVehicle = true
|
isInVehicle = true
|
||||||
current.vehicle = GetVehiclePedIsUsing(playerPed)
|
current.vehicle = tempVehicle
|
||||||
current.seat = GetPedVehicleSeat(playerPed, current.vehicle)
|
current.seat = GetPedVehicleSeat(playerPed, current.vehicle)
|
||||||
current.plate = GetVehicleNumberPlateText(current.vehicle)
|
current.plate = GetVehicleNumberPlateText(current.vehicle)
|
||||||
current.displayName, current.netId = GetData(current.vehicle)
|
current.displayName, current.netId = GetData(current.vehicle)
|
||||||
@@ -88,8 +89,8 @@ CreateThread(function()
|
|||||||
TriggerServerEvent("esx:enteredVehicle", current.plate, current.seat, current.displayName, current.netId)
|
TriggerServerEvent("esx:enteredVehicle", current.plate, current.seat, current.displayName, current.netId)
|
||||||
ToggleVehicleStatus(current.vehicle, current.seat)
|
ToggleVehicleStatus(current.vehicle, current.seat)
|
||||||
end
|
end
|
||||||
elseif isInVehicle then
|
elseif isInVehicle or (current.vehicle ~= tempVehicle) then
|
||||||
if not IsPedInAnyVehicle(playerPed, false) or IsPlayerDead(PlayerId()) then
|
if not IsPedInAnyVehicle(playerPed, false) or IsPlayerDead(PlayerId()) or (current.vehicle ~= tempVehicle) then
|
||||||
-- bye, vehicle
|
-- bye, vehicle
|
||||||
TriggerEvent("esx:exitedVehicle", current.vehicle, current.plate, current.seat, current.displayName, current.netId)
|
TriggerEvent("esx:exitedVehicle", current.vehicle, current.plate, current.seat, current.displayName, current.netId)
|
||||||
TriggerServerEvent("esx:exitedVehicle", current.plate, current.seat, current.displayName, current.netId)
|
TriggerServerEvent("esx:exitedVehicle", current.plate, current.seat, current.displayName, current.netId)
|
||||||
|
|||||||
Reference in New Issue
Block a user