From 07187b99ce283ee724f51b2b234ba71963ea2880 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Wed, 8 Feb 2023 17:59:34 -0600
Subject: [PATCH] Use non-ex events for Mafia 1

---
 scripts/client/event.js | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/scripts/client/event.js b/scripts/client/event.js
index e42cb5b2..c42c2b5d 100644
--- a/scripts/client/event.js
+++ b/scripts/client/event.js
@@ -32,17 +32,21 @@ function addAllEventHandlers() {
 	addEventHandler("OnMouseWheel", onMouseWheel);
 	addEventHandler("OnEntityProcess", onEntityProcess);
 
-	if (findResourceByName("v-events") != null) {
-		if (findResourceByName("v-events").isStarted) {
-			addEventHandler("OnPedEnteredVehicleEx", onPedEnteredVehicle);
-			addEventHandler("OnPedExitedVehicleEx", onPedExitedVehicle);
-			addEventHandler("OnPedEnteredSphereEx", onPedEnteredSphere);
-			addEventHandler("OnPedExitedSphereEx", onPedExitedSphere);
+	if (getGame() <= V_GAME_GTA_SA) {
+		if (findResourceByName("v-events") != null) {
+			if (findResourceByName("v-events").isStarted) {
+				addEventHandler("OnPedEnteredVehicleEx", onPedEnteredVehicle);
+				addEventHandler("OnPedExitedVehicleEx", onPedExitedVehicle);
+				addEventHandler("OnPedEnteredSphereEx", onPedEnteredSphere);
+				addEventHandler("OnPedExitedSphereEx", onPedExitedSphere);
+			}
 		}
 	}
 
 	if (getGame() == V_GAME_MAFIA_ONE) {
 		addEventHandler("OnMapLoaded", onMapLoaded);
+		addEventHandler("OnPedEnteredVehicle", onPedEnteredVehicle);
+		addEventHandler("OnPedExitedVehicle", onPedExitedVehicle);
 	}
 }
 
@@ -56,10 +60,16 @@ function onResourceStart(event, resource) {
 		removeEventHandler("OnPedEnteredSphereEx");
 		removeEventHandler("OnPedExitedSphereEx");
 
-		addEventHandler("OnPedEnteredVehicleEx", onPedEnteredVehicle);
-		addEventHandler("OnPedExitedVehicleEx", onPedExitedVehicle);
-		addEventHandler("OnPedEnteredSphereEx", onPedEnteredSphere);
-		addEventHandler("OnPedExitedSphereEx", onPedExitedSphere);
+		if (getGame() <= V_GAME_GTA_SA) {
+			if (findResourceByName("v-events") != null) {
+				if (findResourceByName("v-events").isStarted) {
+					addEventHandler("OnPedEnteredVehicleEx", onPedEnteredVehicle);
+					addEventHandler("OnPedExitedVehicleEx", onPedExitedVehicle);
+					addEventHandler("OnPedEnteredSphereEx", onPedEnteredSphere);
+					addEventHandler("OnPedExitedSphereEx", onPedExitedSphere);
+				}
+			}
+		}
 	}
 
 	if (resource == thisResource) {