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

refactor(actions) Make handlers name more simple

Browse Source
This commit is contained in:
P Gergő
2023-01-24 22:44:24 +01:00
parent 88447f1823
commit 19e43d29f0
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[core]/es_extended/client/modules/actions.lua
+16 -16
View File
@@ -50,13 +50,13 @@ CreateThread(function()
local seat = GetSeatPedIsTryingToEnter(playerPed)
local displayName, netId = GetData(vehicle)
isEnteringVehicle = true
TriggerEvent('esx:playerEnteringVehicle', vehicle, plate, seat, netId)
TriggerServerEvent('esx:playerEnteringVehicle', vehicle, plate, seat, netId)
TriggerEvent('esx:EnteringVehicle', vehicle, plate, seat, netId)
TriggerServerEvent('esx:EnteringVehicle', vehicle, plate, seat, netId)
elseif not DoesEntityExist(GetVehiclePedIsTryingToEnter(playerPed)) and
not IsPedInAnyVehicle(playerPed, true) and isEnteringVehicle then
-- vehicle entering aborted
TriggerEvent('esx:playerEnteringVehicleAborted')
TriggerServerEvent('esx:playerEnteringVehicleAborted')
TriggerEvent('esx:EnteringVehicleAborted')
TriggerServerEvent('esx:EnteringVehicleAborted')
isEnteringVehicle = false
elseif IsPedInAnyVehicle(playerPed, false) then
-- suddenly appeared in a vehicle, possible teleport
@@ -66,15 +66,15 @@ CreateThread(function()
currentSeat = GetPedVehicleSeat(playerPed, currentVehicle)
currentPlate = GetVehicleNumberPlateText(currentVehicle)
local displayName, netId = GetData(currentVehicle)
TriggerEvent('esx:playerEnteredVehicle', currentVehicle, currentPlate, currentSeat, displayName, netId)
TriggerServerEvent('esx:playerEnteredVehicle', currentVehicle, currentPlate, currentSeat, displayName, netId)
TriggerEvent('esx:EnteredVehicle', currentVehicle, currentPlate, currentSeat, displayName, netId)
TriggerServerEvent('esx:EnteredVehicle', 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, currentPlate, currentSeat, displayName, netId)
TriggerServerEvent('esx:playerExitedVehicle', currentVehicle, currentPlate, currentSeat, displayName, netId)
TriggerEvent('esx:ExitedVehicle', currentVehicle, currentPlate, currentSeat, displayName, netId)
TriggerServerEvent('esx:ExitedVehicle', currentVehicle, currentPlate, currentSeat, displayName, netId)
isInVehicle = false
currentVehicle = nil
currentSeat = nil
@@ -95,20 +95,20 @@ if Config.EnableDebug then
print('esx:playerJumping')
end)
AddEventHandler('esx:playerEnteringVehicle', function(vehicle, plate, seat, netId)
print('esx:playerEnteringVehicle', 'vehicle', vehicle, 'plate', plate, 'seat', seat, 'netId', netId)
AddEventHandler('esx:EnteringVehicle', function(vehicle, plate, seat, netId)
print('esx:EnteringVehicle', 'vehicle', vehicle, 'plate', plate, 'seat', seat, 'netId', netId)
end)
AddEventHandler('esx:playerEnteringVehicleAborted', function()
print('esx:playerEnteringVehicleAborted')
AddEventHandler('esx:EnteringVehicleAborted', function()
print('esx:EnteringVehicleAborted')
end)
AddEventHandler('esx:playerEnteredVehicle', function(vehicle, plate, seat, displayName, netId)
print('esx:playerEnteredVehicle', 'vehicle', vehicle, 'plate', plate, 'seat', seat, 'displayName', displayName, 'netId', netId)
AddEventHandler('esxEnteredVehicle', function(vehicle, plate, seat, displayName, netId)
print('esx:EnteredVehicle', 'vehicle', vehicle, 'plate', plate, 'seat', seat, 'displayName', displayName, 'netId', netId)
end)
AddEventHandler('esx:playerExitedVehicle', function(vehicle, plate, seat, displayName, netId)
print('esx:playerExitedVehicle', 'vehicle', vehicle, 'plate', plate, 'seat', seat, 'displayName', displayName, 'netId', netId)
AddEventHandler('esx:ExitedVehicle', function(vehicle, plate, seat, displayName, netId)
print('esx:ExitedVehicle', 'vehicle', vehicle, 'plate', plate, 'seat', seat, 'displayName', displayName, 'netId', netId)
end)
end
[core]/es_extended/server/modules/actions.lua
+12 -12
View File
@@ -1,9 +1,9 @@
RegisterServerEvent('esx:playerPedChanged')
RegisterServerEvent('esx:playerJumping')
RegisterServerEvent('esx:playerEnteringVehicle')
RegisterServerEvent('esx:playerEnteringVehicleAborted')
RegisterServerEvent('esx:playerEnteredVehicle')
RegisterServerEvent('esx:playerExitedVehicle')
RegisterServerEvent('esx:EnteringVehicle')
RegisterServerEvent('esx:EnteringVehicleAborted')
RegisterServerEvent('esx:EnteredVehicle')
RegisterServerEvent('esx:ExitedVehicle')
if Config.EnableDebug then
@@ -15,20 +15,20 @@ if Config.EnableDebug then
print('esx:playerJumping', source)
end)
AddEventHandler('esx:playerEnteringVehicle', function(vehicle, plate, seat, netId)
print('esx:playerEnteringVehicle', 'source', source, 'vehicle', vehicle, 'plate', plate, 'seat', seat, 'netId', netId)
AddEventHandler('esx:EnteringVehicle', function(vehicle, plate, seat, netId)
print('esx:EnteringVehicle', 'source', source, 'vehicle', vehicle, 'plate', plate, 'seat', seat, 'netId', netId)
end)
AddEventHandler('esx:playerEnteringVehicleAborted', function()
print('esx:playerEnteringVehicleAborted', source)
AddEventHandler('esx:EnteringVehicleAborted', function()
print('esx:EnteringVehicleAborted', source)
end)
AddEventHandler('esx:playerEnteredVehicle', function(vehicle, plate, seat, displayName, netId)
print('esx:playerEnteredVehicle', 'source', source, 'vehicle', vehicle, 'plate', plate, 'seat', seat, 'displayName', displayName, 'netId', netId)
AddEventHandler('esx:EnteredVehicle', function(vehicle, plate, seat, displayName, netId)
print('esx:EnteredVehicle', 'source', source, 'vehicle', vehicle, 'plate', plate, 'seat', seat, 'displayName', displayName, 'netId', netId)
end)
AddEventHandler('esx:playerExitedVehicle', function(vehicle, plate, seat, displayName, netId)
print('esx:playerExitedVehicle', 'source', source, 'vehicle', vehicle, 'plate', plate, 'seat', seat, 'displayName', displayName, 'netId', netId)
AddEventHandler('esx:ExitedVehicle', function(vehicle, plate, seat, displayName, netId)
print('esx:ExitedVehicle', 'source', source, 'vehicle', vehicle, 'plate', plate, 'seat', seat, 'displayName', displayName, 'netId', netId)
end)
end