hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't loop houses if there are none

Browse Source
This commit is contained in:
Vortrex
2022-05-30 07:40:48 -05:00
parent a097da7a63
commit c4916adc55
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
scripts/server/house.js
View File

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