From 24bce67d37641d6b591542903fa4d498aa30a31f Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 7 Mar 2022 02:27:26 -0600
Subject: [PATCH] Interior stuff

---
 scripts/client/utilities.js |  3 +++
 scripts/server/misc.js      | 12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/scripts/client/utilities.js b/scripts/client/utilities.js
index ed0abb08..260cc2ff 100644
--- a/scripts/client/utilities.js
+++ b/scripts/client/utilities.js
@@ -348,6 +348,9 @@ function setLocalPlayerInterior(interior) {
         if(!isGTAIV()) {
             localPlayer.interior = interior;
             game.cameraInterior = interior;
+        } else {
+            let interiorId = natives.getInteriorAtCoords(localPlayer.position);
+            natives.activateInterior(interiorId, true);
         }
     }
 
diff --git a/scripts/server/misc.js b/scripts/server/misc.js
index b50dc6ab..2b0b84ee 100644
--- a/scripts/server/misc.js
+++ b/scripts/server/misc.js
@@ -158,13 +158,13 @@ function enterExitPropertyCommand(command, params, client) {
 		}		
 	} else {
 		for(let i in getServerData().businesses) {
-			if(getPlayerDimension(client) == mainWorldDimension[getGame()] && getPlayerInterior(client) == mainWorldInterior[getGame()]) {
-				let businessId = getClosestBusinessEntrance(getPlayerPosition(client), dimension);
+			if(getPlayerDimension(client) == getGameConfig().mainWorldDimension[getGame()] && getPlayerInterior(client) == getGameConfig().mainWorldInterior[getGame()]) {
+				let businessId = getClosestBusinessEntrance(getPlayerPosition(client), getPlayerDimension(client));
 				isBusiness = true;
 				isEntrance = true;
 				closestProperty = getServerData().businesses[businessId];		
 			} else {
-				let businessId = getClosestBusinessExit(getPlayerPosition(client), dimension);
+				let businessId = getClosestBusinessExit(getPlayerPosition(client), getPlayerDimension(client));
 				isBusiness = true;
 				isEntrance = false;
 				closestProperty = getServerData().businesses[businessId];	
@@ -172,13 +172,13 @@ function enterExitPropertyCommand(command, params, client) {
 		}
 
 		for(let j in getServerData().houses) {
-			if(getPlayerDimension(client) == mainWorldDimension[getGame()] && getPlayerInterior(client) == mainWorldInterior[getGame()]) {
-				let houseId = getClosestHouseEntrance(getPlayerPosition(client), dimension);
+			if(getPlayerDimension(client) == getGameConfig().mainWorldDimension[getGame()] && getPlayerInterior(client) == getGameConfig().mainWorldInterior[getGame()]) {
+				let houseId = getClosestHouseEntrance(getPlayerPosition(client), getPlayerDimension(client));
 				isBusiness = false;
 				isEntrance = true;
 				closestProperty = getServerData().businesses[houseId];	
 			} else {
-				let houseId = getClosestHouseExit(getPlayerPosition(client), dimension);
+				let houseId = getClosestHouseExit(getPlayerPosition(client), getPlayerDimension(client));
 				isBusiness = false;
 				isEntrance = false;
 				closestProperty = getServerData().businesses[houseId];