From 707347c5a43bae7717579dac5112c932ea8d1149 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Wed, 23 Dec 2020 23:02:54 -0600 Subject: [PATCH] Fix check to see if house has int on using enter --- scripts/server/house.js | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/scripts/server/house.js b/scripts/server/house.js index 1998d60d..aa43c0df 100644 --- a/scripts/server/house.js +++ b/scripts/server/house.js @@ -196,7 +196,7 @@ function getHouseData(houseId) { // --------------------------------------------------------------------------- function doesHouseHaveInterior(houseId) { - if(getHouseData(houseId)) { + if(!getHouseData(houseId)) { return false; } @@ -209,11 +209,32 @@ function doesHouseHaveInterior(houseId) { return false; } - if(houseData.exitDimension == 0) { + if(houseData.exitInterior == 0) { return false; } + if(houseData.exitInterior == -1) { + return false; + } + return true; } +// --------------------------------------------------------------------------- + +function sendAllHouseLabelsToClient(client) { + let tempHouseLabels = []; + for(let i in getServerData().houses) { + tempHouseLabels.push([i, getServerData().houses[i].entrancePosition, getServerConfig().propertyLabelHeight[getServerGame()], getServerData().houses[i].description, getServerData().houses[i].locked, false]); + } + + triggerNetworkEvent("ag.houselabel.all", client, tempHouseLabels); +} + +// --------------------------------------------------------------------------- + +function sendHouseLabelToClients(houseId) { + triggerNetworkEvent("ag.houselabel.add", null, houseId, getServerData().houses[houseId].entrancePosition, getServerConfig().propertyLabelHeight[getServerGame()], getServerData().houses[houseId].description, getServerData().houses[houseId].locked, false); +} + // --------------------------------------------------------------------------- \ No newline at end of file