From c63ec5f4f62848aedbcf8ee8d4b9662a51e4516d Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 16 Aug 2022 11:27:37 -0500
Subject: [PATCH] Restore vehicle engine state on enter

---
 scripts/client/event.js | 34 ++++++++++++++++++++++++----------
 scripts/server/event.js | 16 ++++++++++++++--
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/scripts/client/event.js b/scripts/client/event.js
index 8cfa7bfa..989dfd3a 100644
--- a/scripts/client/event.js
+++ b/scripts/client/event.js
@@ -155,24 +155,38 @@ function onPedExitedVehicle(event, ped, vehicle, seat) {
 	//logToConsole(LOG_DEBUG, `[VRR.Event] Local player exited vehicle`);
 	//sendNetworkEventToServer("agrp.onPlayerExitVehicle", getVehicleForNetworkEvent(vehicle), seat);
 
-	if (inVehicleSeat) {
-		parkedVehiclePosition = false;
-		parkedVehicleHeading = false;
+	if (localPlayer != null) {
+		if (ped == localPlayer) {
+			if (areServerElementsSupported()) {
+				if (inVehicleSeat == 0) {
+					//setVehicleEngine(vehicle.id, false);
+					if (!inVehicle.engine) {
+						parkedVehiclePosition = false;
+						parkedVehicleHeading = false;
+					}
+				}
+			}
+		}
 	}
 }
 
 // ===========================================================================
 
 function onPedEnteredVehicle(event, ped, vehicle, seat) {
-	logToConsole(LOG_DEBUG, `[VRR.Event] Local player entered vehicle`);
+	logToConsole(LOG_DEBUG, `[VRR.Event] Ped entered vehicle`);
 	//sendNetworkEventToServer("agrp.onPlayerEnterVehicle", getVehicleForNetworkEvent(vehicle), seat);
 
-	if (areServerElementsSupported()) {
-		if (inVehicleSeat == 0) {
-			setVehicleEngine(vehicle.id, false);
-			if (!inVehicle.engine) {
-				parkedVehiclePosition = inVehicle.position;
-				parkedVehicleHeading = inVehicle.heading;
+
+	if (localPlayer != null) {
+		if (ped == localPlayer) {
+			if (areServerElementsSupported()) {
+				if (inVehicleSeat == 0) {
+					//setVehicleEngine(vehicle.id, false);
+					if (!inVehicle.engine) {
+						parkedVehiclePosition = inVehicle.position;
+						parkedVehicleHeading = inVehicle.heading;
+					}
+				}
 			}
 		}
 	}
diff --git a/scripts/server/event.js b/scripts/server/event.js
index 04980d9c..c706b2af 100644
--- a/scripts/server/event.js
+++ b/scripts/server/event.js
@@ -690,7 +690,7 @@ function onPedEnteredVehicle(event, ped, vehicle, seat) {
 			getPlayerData(client).lastVehicle = vehicle;
 			getVehicleData(vehicle).lastActiveTime = getCurrentUnixTimestamp();
 
-			if (getPlayerVehicleSeat(client) == AGRP_VEHSEAT_DRIVER) {
+			if (seat == AGRP_VEHSEAT_DRIVER) {
 				vehicle.engine = getVehicleData(vehicle).engine;
 
 				if (getVehicleData(vehicle).buyPrice > 0) {
@@ -787,7 +787,7 @@ function onPedEnteringVehicle(event, ped, vehicle, seat) {
 	if (ped.isType(ELEMENT_PLAYER)) {
 		let client = getClientFromPlayerElement(ped);
 		if (client != null) {
-
+			onPlayerEnteringVehicle(client, vehicle, seat);
 		}
 	}
 }
@@ -803,4 +803,16 @@ function onPedExitingVehicle(event, ped, vehicle, seat) {
 	}
 }
 
+// ===========================================================================
+
+function onPlayerEnteringVehicle(client, vehicle, seat) {
+
+}
+
+// ===========================================================================
+
+function onPlayerExitingVehicle(client, vehicle, seat) {
+
+}
+
 // ===========================================================================
\ No newline at end of file