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

Fixed move house exit and get plr house funcs

Browse Source
This commit is contained in:
Vortrex
2022-05-01 15:05:19 -05:00
parent 3099a9ee49
commit 982fcf9278
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
scripts/server/house.js
View File

@@ -343,7 +343,7 @@ function setHouseInteriorTypeCommand(command, params, client) {
return false;
}
if(typeof getGameData().interiors[getGame()] == "undefined") {
if(typeof getGameConfig().interiors[getGame()] == "undefined") {
messagePlayerError(client, `There are no interiors available for this game!`);
return false;
}
@@ -455,7 +455,7 @@ function moveHouseEntranceCommand(command, params, client) {
let houseId = getPlayerHouse(client);
if(!getHouseData(houseId)) {
messagePlayer(client, getLocaleString(client, "InvalidHouse"));
messagePlayerError(client, getLocaleString(client, "InvalidHouse"));
return false;
}
@@ -488,10 +488,10 @@ function moveHouseEntranceCommand(command, params, client) {
*
*/
function moveHouseExitCommand(command, params, client) {
let houseId = getPlayerHouse(client);
let houseId = getClosestHouseEntrance(getPlayerPosition(client), getPlayerDimension(client));
if(!getHouseData(houseId)) {
messagePlayer(client, getLocaleString(client, "InvalidHouse"));
messagePlayerError(client, getLocaleString(client, "InvalidHouse"));
return false;
}
@@ -661,14 +661,21 @@ function getClosestHouseExit(position, dimension) {
// ===========================================================================
function getPlayerHouse(client) {
let closestEntrance = getClosestHouseEntrance(getPlayerPosition(client), getPlayerDimension(client));
if(getDistance(getPlayerPosition(client), getHouseData(closestEntrance).entrancePosition) <= getGlobalConfig().enterPropertyDistance) {
return getHouseData(closestEntrance).index
}
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].exitDimension == getPlayerDimension(client)) {
return i;
for(let i in getServerData().houses) {
if(getServerData().houses[i].hasInterior && getServerData().houses[i].exitDimension == getPlayerDimension(client)) {
return i;
}
}
}