From a78ec09d1351d18c55bb678861c6362fc0d85caa Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Wed, 9 Mar 2022 02:50:58 -0600
Subject: [PATCH] Add IV veh ID to get veh data util

---
 scripts/server/vehicle.js | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/scripts/server/vehicle.js b/scripts/server/vehicle.js
index a222665c..097f9ad6 100644
--- a/scripts/server/vehicle.js
+++ b/scripts/server/vehicle.js
@@ -174,13 +174,15 @@ function spawnAllVehicles() {
  * @return {VehicleData} The vehicles's data (class instance)
  */
 function getVehicleData(vehicle) {
-	if(isVehicleObject(vehicle)) {
-		let dataIndex = getEntityData(vehicle, "vrr.dataSlot");
-		if(typeof getServerData().vehicles[dataIndex] != "undefined") {
-			return getServerData().vehicles[dataIndex];
+	if(getGame() != VRR_GAME_GTA_IV) {
+		if(isVehicleObject(vehicle)) {
+			let dataIndex = getEntityData(vehicle, "vrr.dataSlot");
+			if(typeof getServerData().vehicles[dataIndex] != "undefined") {
+				return getServerData().vehicles[dataIndex];
+			}
 		}
 	} else {
-
+		return getServerVehicles().find((v) => v.ivNetworkId == vehicle);
 	}
 
 	return false;
@@ -1403,7 +1405,11 @@ function createPermanentVehicle(modelIndex, position, heading, interior = 0, dim
 	}
 
 	let slot = getServerData().vehicles.push(tempVehicleData);
-	setEntityData(vehicle, "vrr.dataSlot", slot-1, false);
+
+	if(areServerElementsSupported()) {
+		setEntityData(vehicle, "vrr.dataSlot", slot-1, false);
+	}
+
 
 	return vehicle;
 }