From c4916adc5531ba000936d698f4ffb50d1f4e35cd Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 30 May 2022 07:40:48 -0500
Subject: [PATCH] Don't loop houses if there are none

---
 scripts/server/house.js | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/scripts/server/house.js b/scripts/server/house.js
index 24e4c318..2c1b6953 100644
--- a/scripts/server/house.js
+++ b/scripts/server/house.js
@@ -659,20 +659,22 @@ function getClosestHouseExit(position, dimension) {
 // ===========================================================================
 
 function getPlayerHouse(client) {
-	if(getPlayerDimension(client) == getGameConfig().mainWorldDimension[getGame()]) {
-		let closestEntrance = getClosestHouseEntrance(getPlayerPosition(client), getPlayerDimension(client));
-		if(getDistance(getPlayerPosition(client), getHouseData(closestEntrance).entrancePosition) <= getGlobalConfig().enterPropertyDistance) {
-			return getHouseData(closestEntrance).index;
-		}
-	} else {
-		let closestEntrance = getClosestHouseEntrance(getPlayerPosition(client), getPlayerDimension(client));
-		if(getDistance(getPlayerPosition(client), getHouseData(closestEntrance).entrancePosition) <= getGlobalConfig().enterPropertyDistance) {
-			return getHouseData(closestEntrance).index;
-		}
+	if(getServerData().houses.length > 0) {
+		if(getPlayerDimension(client) == getGameConfig().mainWorldDimension[getGame()]) {
+			let closestEntrance = getClosestHouseEntrance(getPlayerPosition(client), getPlayerDimension(client));
+			if(getDistance(getPlayerPosition(client), getHouseData(closestEntrance).entrancePosition) <= getGlobalConfig().enterPropertyDistance) {
+				return getHouseData(closestEntrance).index;
+			}
+		} else {
+			let closestEntrance = getClosestHouseEntrance(getPlayerPosition(client), getPlayerDimension(client));
+			if(getDistance(getPlayerPosition(client), getHouseData(closestEntrance).entrancePosition) <= getGlobalConfig().enterPropertyDistance) {
+				return getHouseData(closestEntrance).index;
+			}
 
-		for(let i in getServerData().houses) {
-			if(getServerData().houses[i].hasInterior && getServerData().houses[i].exitDimension == getPlayerDimension(client)) {
-				return i;
+			for(let i in getServerData().houses) {
+				if(getServerData().houses[i].hasInterior && getServerData().houses[i].exitDimension == getPlayerDimension(client)) {
+					return i;
+				}
 			}
 		}
 	}