From 19e43d29f0f5f40f7355c0958edb094291503fe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=20Gerg=C5=91?= Date: Tue, 24 Jan 2023 22:44:24 +0100 Subject: [PATCH] refactor(actions) Make handlers name more simple --- [core]/es_extended/client/modules/actions.lua | 32 +++++++++---------- [core]/es_extended/server/modules/actions.lua | 24 +++++++------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/[core]/es_extended/client/modules/actions.lua b/[core]/es_extended/client/modules/actions.lua index 7dd5b80e..6f20d710 100644 --- a/[core]/es_extended/client/modules/actions.lua +++ b/[core]/es_extended/client/modules/actions.lua @@ -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 \ 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 31df067c..df9bfe65 100644 --- a/[core]/es_extended/server/modules/actions.lua +++ b/[core]/es_extended/server/modules/actions.lua @@ -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 \ No newline at end of file