From 4fac1cb35051ea2024bdd66aa73fb82b417392ed Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 1 Aug 2022 11:34:44 -0500
Subject: [PATCH] Add remove players from house util

---
 scripts/server/house.js | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/scripts/server/house.js b/scripts/server/house.js
index d32cca7f..1952a285 100644
--- a/scripts/server/house.js
+++ b/scripts/server/house.js
@@ -732,6 +732,27 @@ function removePlayerFromHouse(client) {
 
 // ===========================================================================
 
+/**
+ * Forces all players to exit a house
+ *
+ * @param {Number} houseId - The data index of the house to force all players inside to exit from
+ * @return {Boolean} Whether or not the players were forced to exit
+ *
+ */
+function removePlayersFromHouse(houseId) {
+	getClients().forEach(function (client) {
+		if (doesHouseHaveInterior(houseId)) {
+			if (getPlayerHouse(client) == houseId) {
+				exitHouse(client);
+			}
+		}
+	});
+
+	return true;
+}
+
+// ===========================================================================
+
 /**
  * This function creates a house
  *
@@ -889,7 +910,7 @@ function saveHouseToDatabase(houseId) {
 			["house_entrance_vw", tempHouseData.entranceDimension],
 			["house_entrance_pickup", tempHouseData.entrancePickupModel],
 			["house_entrance_blip", tempHouseData.entranceBlipModel],
-			["house_entrance_cutscene", tempHouseData.entranceCutscene],
+			//["house_entrance_cutscene", tempHouseData.entranceCutscene],
 			["house_exit_pos_x", tempHouseData.exitPosition.x],
 			["house_exit_pos_y", tempHouseData.exitPosition.y],
 			["house_exit_pos_z", tempHouseData.exitPosition.z],
@@ -898,7 +919,7 @@ function saveHouseToDatabase(houseId) {
 			["house_exit_vw", tempHouseData.exitDimension],
 			["house_exit_pickup", tempHouseData.exitPickupModel],
 			["house_exit_blip", tempHouseData.exitBlipModel],
-			["house_exit_cutscene", tempHouseData.exitCutscene],
+			//["house_exit_cutscene", tempHouseData.exitCutscene],
 			["house_buy_price", tempHouseData.buyPrice],
 			["house_rent_price", tempHouseData.rentPrice],
 			["house_has_interior", boolToInt(tempHouseData.hasInterior)],
@@ -1547,9 +1568,9 @@ function reloadAllHousesCommand(command, params, client) {
 function exitHouse(client) {
 	let houseId = getPlayerHouse(client);
 	if (isPlayerSpawned(client)) {
-		setPlayerInterior(client, getServerData().house[houseId].entranceInterior);
-		setPlayerDimension(client, getServerData().house[houseId].entranceDimension);
-		setPlayerPosition(client, getServerData().house[houseId].entrancePosition);
+		setPlayerInterior(client, getServerData().houses[houseId].entranceInterior);
+		setPlayerDimension(client, getServerData().houses[houseId].entranceDimension);
+		setPlayerPosition(client, getServerData().houses[houseId].entrancePosition);
 	}
 }