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

Fix house enter sometimes not working

Browse Source
This commit is contained in:
Vortrex
2022-10-19 21:40:52 -05:00
parent 2e2e44566d
commit 5eb459b308
1 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
scripts/server/misc.js
View File

@@ -211,6 +211,9 @@ function enterExitPropertyCommand(command, params, client) {
return false; return false;
} }
// The player's currentPickup wasn't always being set. This prevented entering/exiting a property.
// Needs further testing and tweaks.
/*
if (areServerElementsSupported() && getGame() != AGRP_GAME_MAFIA_ONE) { if (areServerElementsSupported() && getGame() != AGRP_GAME_MAFIA_ONE) {
if (!getPlayerData(client).currentPickup) { if (!getPlayerData(client).currentPickup) {
return false; return false;
@@ -248,31 +251,41 @@ function enterExitPropertyCommand(command, params, client) {
return false; return false;
} }
} else { } else {
for (let i in getServerData().businesses) { */
if (getPlayerDimension(client) == getGameConfig().mainWorldDimension[getGame()] && getPlayerInterior(client) == getGameConfig().mainWorldInterior[getGame()]) {
let businessId = getClosestBusinessEntrance(getPlayerPosition(client), getPlayerDimension(client)); // Check business first
if (closestProperty == null) {
if (getPlayerDimension(client) == getGameConfig().mainWorldDimension[getGame()] && getPlayerInterior(client) == getGameConfig().mainWorldInterior[getGame()]) {
let businessIndex = getClosestBusinessEntrance(getPlayerPosition(client), getPlayerDimension(client));
if (getDistance(getBusinessData(businessIndex).entrancePosition, getPlayerPosition(client)) <= 1.5) {
isBusiness = true; isBusiness = true;
isEntrance = true; isEntrance = true;
closestProperty = getServerData().businesses[businessId]; closestProperty = getServerData().businesses[businessIndex];
} else { }
let businessId = getClosestBusinessExit(getPlayerPosition(client), getPlayerDimension(client)); } else {
isBusiness = true; let businessIndex = getClosestHouseExit(getPlayerPosition(client), getPlayerDimension(client));
if (getDistance(getBusinessData(businessIndex).exitPosition, getPlayerPosition(client)) <= 1.5) {
isBusiness = false;
isEntrance = false; isEntrance = false;
closestProperty = getServerData().businesses[businessId]; closestProperty = getServerData().businesses[businessIndex];
} }
} }
}
for (let j in getServerData().houses) { if (closestProperty == null) {
if (getPlayerDimension(client) == getGameConfig().mainWorldDimension[getGame()] && getPlayerInterior(client) == getGameConfig().mainWorldInterior[getGame()]) { if (getPlayerDimension(client) == getGameConfig().mainWorldDimension[getGame()] && getPlayerInterior(client) == getGameConfig().mainWorldInterior[getGame()]) {
let houseId = getClosestHouseEntrance(getPlayerPosition(client), getPlayerDimension(client)); let houseIndex = getClosestHouseEntrance(getPlayerPosition(client), getPlayerDimension(client));
if (getDistance(getHouseData(houseIndex).entrancePosition, getPlayerPosition(client)) <= 1.5) {
isBusiness = false; isBusiness = false;
isEntrance = true; isEntrance = true;
closestProperty = getServerData().businesses[houseId]; closestProperty = getServerData().houses[houseIndex];
} else { }
let houseId = getClosestHouseExit(getPlayerPosition(client), getPlayerDimension(client)); } else {
let houseIndex = getClosestHouseExit(getPlayerPosition(client), getPlayerDimension(client));
if (getDistance(getHouseData(houseIndex).exitPosition, getPlayerPosition(client)) <= 1.5) {
isBusiness = false; isBusiness = false;
isEntrance = false; isEntrance = false;
closestProperty = getServerData().businesses[houseId]; closestProperty = getServerData().houses[houseIndex];
} }
} }
} }