From 84edbd9a54474d7dc07315f9e9e7a014c2869893 Mon Sep 17 00:00:00 2001
From: Thekuca <63980591+Thekuca@users.noreply.github.com>
Date: Wed, 8 Mar 2023 19:35:59 +0100
Subject: [PATCH 1/2] feat(es_extended/client/modules/actions.lua): Added
 disable seat shuff (PART 2)

---
 [core]/es_extended/client/modules/actions.lua | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/[core]/es_extended/client/modules/actions.lua b/[core]/es_extended/client/modules/actions.lua
index 47f3aa4a..725e32e1 100644
--- a/[core]/es_extended/client/modules/actions.lua
+++ b/[core]/es_extended/client/modules/actions.lua
@@ -56,6 +56,12 @@ CreateThread(function()
                 isEnteringVehicle = true
                 TriggerEvent('esx:enteringVehicle', vehicle, plate, seat, netId)
                 TriggerServerEvent('esx:enteringVehicle', plate, seat, netId)
+				if Config.DisableVehicleSeatShuff then
+					if seat == 0 then
+						SetPedIntoVehicle(playerPed, vehicle, 0)
+						SetPedConfigFlag(playerPed, 184, true)
+					end	
+				end
             elseif not DoesEntityExist(GetVehiclePedIsTryingToEnter(playerPed)) and
                 not IsPedInAnyVehicle(playerPed, true) and isEnteringVehicle then
                 -- vehicle entering aborted
@@ -72,6 +78,12 @@ CreateThread(function()
                 current.displayName, current.netId = GetData(current.vehicle)
                 TriggerEvent('esx:enteredVehicle', current.vehicle, current.plate, current.seat, current.displayName, current.netId)
                 TriggerServerEvent('esx:enteredVehicle', current.plate, current.seat, current.displayName, current.netId)
+				if Config.DisableVehicleSeatShuff then
+					if current.seat == 0 then
+						SetPedIntoVehicle(playerPed, current.vehicle, 0)
+						SetPedConfigFlag(playerPed, 184, true)
+					end	
+				end
             end
         elseif isInVehicle then
             if not IsPedInAnyVehicle(playerPed, false) or IsPlayerDead(PlayerId()) then
@@ -112,4 +124,4 @@ if Config.EnableDebug then
         print('esx:exitedVehicle', 'vehicle', vehicle, 'plate', plate, 'seat', seat, 'displayName', displayName, 'netId', netId)
     end)
 
-end
\ No newline at end of file
+end

From 513dbf7e12fc1eafa5748ab92154a53b7f7888ae Mon Sep 17 00:00:00 2001
From: Thekuca <63980591+Thekuca@users.noreply.github.com>
Date: Wed, 8 Mar 2023 20:22:08 +0100
Subject: [PATCH 2/2] fix(PR): Fixed the PR code

---
 [core]/es_extended/client/modules/actions.lua | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/[core]/es_extended/client/modules/actions.lua b/[core]/es_extended/client/modules/actions.lua
index 725e32e1..4123c485 100644
--- a/[core]/es_extended/client/modules/actions.lua
+++ b/[core]/es_extended/client/modules/actions.lua
@@ -56,12 +56,6 @@ CreateThread(function()
                 isEnteringVehicle = true
                 TriggerEvent('esx:enteringVehicle', vehicle, plate, seat, netId)
                 TriggerServerEvent('esx:enteringVehicle', plate, seat, netId)
-				if Config.DisableVehicleSeatShuff then
-					if seat == 0 then
-						SetPedIntoVehicle(playerPed, vehicle, 0)
-						SetPedConfigFlag(playerPed, 184, true)
-					end	
-				end
             elseif not DoesEntityExist(GetVehiclePedIsTryingToEnter(playerPed)) and
                 not IsPedInAnyVehicle(playerPed, true) and isEnteringVehicle then
                 -- vehicle entering aborted