From 4cb163946128a2e0d6b8d3a832b5681b1f8ec811 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sun, 5 Mar 2023 20:43:59 -0600
Subject: [PATCH] Fix unoccupied veh util

---
 scripts/server/vehicle.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/scripts/server/vehicle.js b/scripts/server/vehicle.js
index bff43b68..89e83881 100644
--- a/scripts/server/vehicle.js
+++ b/scripts/server/vehicle.js
@@ -1370,7 +1370,7 @@ function respawnAllVehiclesCommand(command, params, client) {
 
 function respawnEmptyVehiclesCommand(command, params, client) {
 	for (let i in getServerData().vehicles) {
-		if (!isVehicleUnoccupied(getServerData().vehicles[i].vehicle)) {
+		if (isVehicleUnoccupied(getServerData().vehicles[i].vehicle)) {
 			respawnVehicle(getServerData().vehicles[i].vehicle);
 		}
 	}
@@ -1858,13 +1858,18 @@ function getVehicleFromDatabaseId(databaseId) {
 // ===========================================================================
 
 function isVehicleUnoccupied(vehicle) {
-	for (let i = 0; i <= 8; i++) {
-		if (vehicle.getOccupant(i) != null) {
-			return true;
+	let clients = getClients();
+	for (let i in clients) {
+		if (clients[i].player != null) {
+			if (clients[i].player.vehicle != false) {
+				if (clients[i].player.vehicle == vehicle) {
+					return false;
+				}
+			}
 		}
 	}
 
-	return false;
+	return true;
 }
 
 // ===========================================================================