From 4261d63dbaeccf47d343fdc12f48a72c4ab27f07 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Oct 2021 22:41:50 -0500
Subject: [PATCH] Fix job vehicle keys issue

---
 scripts/server/vehicle.js | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/scripts/server/vehicle.js b/scripts/server/vehicle.js
index 4f36afee..61044e65 100644
--- a/scripts/server/vehicle.js
+++ b/scripts/server/vehicle.js
@@ -700,7 +700,7 @@ function doesPlayerHaveVehicleKeys(client, vehicle) {
 	}
 
 	if(vehicleData.ownerType == VRR_VEHOWNER_JOB) {
-		if(vehicleData.ownerId == getJobType(getPlayerCurrentSubAccount(client).job)) {
+		if(vehicleData.ownerId == getPlayerCurrentSubAccount(client).job) {
 			return true;
 		}
 	}
@@ -1379,4 +1379,33 @@ function setAllVehicleIndexes() {
 	}
 }
 
+// ===========================================================================
+
+function doesVehicleHaveMegaphone(vehicle) {
+	if(getJobType(getJobIdFromDatabaseId(getVehicleData(vehicle).job)) == VRR_JOB_POLICE) {
+		return true;
+	}
+
+	if(getJobType(getJobIdFromDatabaseId(getVehicleData(vehicle).job)) == VRR_JOB_FIRE) {
+		return true;
+	}
+
+	if(getJobType(getJobIdFromDatabaseId(getVehicleData(vehicle).job)) == VRR_JOB_MEDICAL) {
+		return true;
+	}
+
+	return false;
+}
+
+// ===========================================================================
+
+function getVehicleFromDatabaseId(databaseId) {
+	let vehicles = getServerData().vehicles;
+	for(let i in vehicles) {
+		if(vehicles[i].databaseId == databaseId) {
+			return vehicles[i].vehicle;
+		}
+	}
+}
+
 // ===========================================================================
\ No newline at end of file