starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-29 01:08:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added plate to handlers

Browse Source
This commit is contained in:
P Gergő
2023-01-24 21:14:37 +01:00
parent 0e700dfcc7
commit 88447f1823
2 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[core]/es_extended/client/modules/actions.lua
+18 -15
View File
@@ -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
[core]/es_extended/server/modules/actions.lua
+6 -6
View File
@@ -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