From 88447f1823f18b055578f4afa8fdfcb124af320a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=20Gerg=C5=91?= Date: Tue, 24 Jan 2023 21:14:37 +0100 Subject: [PATCH] Added plate to handlers --- [core]/es_extended/client/modules/actions.lua | 33 ++++++++++--------- [core]/es_extended/server/modules/actions.lua | 12 +++---- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/[core]/es_extended/client/modules/actions.lua b/[core]/es_extended/client/modules/actions.lua index 121f3f3a..7dd5b80e 100644 --- a/[core]/es_extended/client/modules/actions.lua +++ b/[core]/es_extended/client/modules/actions.lua @@ -1,5 +1,5 @@ local isInVehicle, isEnteringVehicle, isJumping, inPauseMenu = false, false, false, false -local currentVehicle, currentSeat = 0, 0 +local currentVehicle, currentSeat, currentPlate = nil, nil, nil local playerPed = PlayerPedId() local function GetPedVehicleSeat(ped, vehicle) @@ -46,11 +46,12 @@ CreateThread(function() if DoesEntityExist(GetVehiclePedIsTryingToEnter(playerPed)) and not isEnteringVehicle then -- trying to enter a vehicle! local vehicle = GetVehiclePedIsTryingToEnter(playerPed) + local plate = GetVehicleNumberPlateText(vehicle) local seat = GetSeatPedIsTryingToEnter(playerPed) local displayName, netId = GetData(vehicle) isEnteringVehicle = true - TriggerEvent('esx:playerEnteringVehicle', vehicle, seat, netId) - TriggerServerEvent('esx:playerEnteringVehicle', vehicle, seat, netId) + TriggerEvent('esx:playerEnteringVehicle', vehicle, plate, seat, netId) + TriggerServerEvent('esx:playerEnteringVehicle', vehicle, plate, seat, netId) elseif not DoesEntityExist(GetVehiclePedIsTryingToEnter(playerPed)) and not IsPedInAnyVehicle(playerPed, true) and isEnteringVehicle then -- vehicle entering aborted @@ -63,19 +64,21 @@ CreateThread(function() isInVehicle = true currentVehicle = GetVehiclePedIsUsing(playerPed) currentSeat = GetPedVehicleSeat(playerPed, currentVehicle) + currentPlate = GetVehicleNumberPlateText(currentVehicle) local displayName, netId = GetData(currentVehicle) - TriggerEvent('esx:playerEnteredVehicle', currentVehicle, currentSeat, displayName, netId) - TriggerServerEvent('esx:playerEnteredVehicle', currentVehicle, currentSeat, displayName, netId) + TriggerEvent('esx:playerEnteredVehicle', currentVehicle, currentPlate, currentSeat, displayName, netId) + TriggerServerEvent('esx:playerEnteredVehicle', currentVehicle, currentPlate, currentSeat, displayName, netId) end elseif isInVehicle then if not IsPedInAnyVehicle(playerPed, false) or IsPlayerDead(PlayerId()) then -- bye, vehicle local displayName, netId = GetData(currentVehicle) - TriggerEvent('esx:playerExitedVehicle', currentVehicle, currentSeat, displayName, netId) - TriggerServerEvent('esx:playerExitedVehicle', currentVehicle, currentSeat, displayName, netId) + TriggerEvent('esx:playerExitedVehicle', currentVehicle, currentPlate, currentSeat, displayName, netId) + TriggerServerEvent('esx:playerExitedVehicle', currentVehicle, currentPlate, currentSeat, displayName, netId) isInVehicle = false - currentVehicle = 0 - currentSeat = 0 + currentVehicle = nil + currentSeat = nil + currentPlate = nil end end Wait(200) @@ -92,20 +95,20 @@ if Config.EnableDebug then print('esx:playerJumping') end) - AddEventHandler('esx:playerEnteringVehicle', function(vehicle, seat, netId) - print('esx:playerEnteringVehicle', 'vehicle', vehicle, 'seat', seat, 'netId', netId) + AddEventHandler('esx:playerEnteringVehicle', function(vehicle, plate, seat, netId) + print('esx:playerEnteringVehicle', 'vehicle', vehicle, 'plate', plate, 'seat', seat, 'netId', netId) end) AddEventHandler('esx:playerEnteringVehicleAborted', function() print('esx:playerEnteringVehicleAborted') end) - AddEventHandler('esx:playerEnteredVehicle', function(vehicle, seat, displayName, netId) - print('esx:playerEnteredVehicle', 'vehicle', vehicle, 'seat', seat, 'displayName', displayName, 'netId', netId) + AddEventHandler('esx:playerEnteredVehicle', function(vehicle, plate, seat, displayName, netId) + print('esx:playerEnteredVehicle', 'vehicle', vehicle, 'plate', plate, 'seat', seat, 'displayName', displayName, 'netId', netId) end) - AddEventHandler('esx:playerExitedVehicle', function(vehicle, seat, displayName, netId) - print('esx:playerExitedVehicle', 'vehicle', vehicle, 'seat', seat, 'displayName', displayName, 'netId', netId) + AddEventHandler('esx:playerExitedVehicle', function(vehicle, plate, seat, displayName, netId) + print('esx:playerExitedVehicle', 'vehicle', vehicle, 'plate', plate, 'seat', seat, 'displayName', displayName, 'netId', netId) end) end \ No newline at end of file diff --git a/[core]/es_extended/server/modules/actions.lua b/[core]/es_extended/server/modules/actions.lua index 83eecbc3..31df067c 100644 --- a/[core]/es_extended/server/modules/actions.lua +++ b/[core]/es_extended/server/modules/actions.lua @@ -15,20 +15,20 @@ if Config.EnableDebug then print('esx:playerJumping', source) end) - AddEventHandler('esx:playerEnteringVehicle', function(vehicle, seat, netId) - print('esx:playerEnteringVehicle', 'source', source, 'vehicle', vehicle, 'seat', seat, 'netId', netId) + AddEventHandler('esx:playerEnteringVehicle', function(vehicle, plate, seat, netId) + print('esx:playerEnteringVehicle', 'source', source, 'vehicle', vehicle, 'plate', plate, 'seat', seat, 'netId', netId) end) AddEventHandler('esx:playerEnteringVehicleAborted', function() print('esx:playerEnteringVehicleAborted', source) end) - AddEventHandler('esx:playerEnteredVehicle', function(vehicle, seat, displayName, netId) - print('esx:playerEnteredVehicle', 'source', source, 'vehicle', vehicle, 'seat', seat, 'displayName', displayName, 'netId', netId) + AddEventHandler('esx:playerEnteredVehicle', function(vehicle, plate, seat, displayName, netId) + print('esx:playerEnteredVehicle', 'source', source, 'vehicle', vehicle, 'plate', plate, 'seat', seat, 'displayName', displayName, 'netId', netId) end) - AddEventHandler('esx:playerExitedVehicle', function(vehicle, seat, displayName, netId) - print('esx:playerExitedVehicle', 'source', source, 'vehicle', vehicle, 'seat', seat, 'displayName', displayName, 'netId', netId) + AddEventHandler('esx:playerExitedVehicle', function(vehicle, plate, seat, displayName, netId) + print('esx:playerExitedVehicle', 'source', source, 'vehicle', vehicle, 'plate', plate, 'seat', seat, 'displayName', displayName, 'netId', netId) end) end \ No newline at end of file