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

Fix add biz and get player biz funcs

Browse Source
This commit is contained in:
Vortrex
2022-05-01 15:04:15 -05:00
parent 8cd4151a97
commit 664fcf53ea
1 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
scripts/server/business.js
View File

@@ -192,7 +192,7 @@ function createBusinessLocationCommand(command, params, client) {
// =========================================================================== // ===========================================================================
function createBusiness(name, entrancePosition, exitPosition, entrancePickupModel = -1, entranceBlipModel = -1, entranceInteriorId = 0, entranceVirtualWorld = 0, exitInteriorId = -1, exitVirtualWorld = -1, exitPickupModel = -1, exitBlipModel = -1, entranceCutscene = "") { function createBusiness(name, entrancePosition, exitPosition, entrancePickupModel = -1, entranceBlipModel = -1, entranceInteriorId = 0, entranceVirtualWorld = 0, entranceCutscene = "", exitCutscene = "") {
let tempBusinessData = new BusinessData(false); let tempBusinessData = new BusinessData(false);
tempBusinessData.name = name; tempBusinessData.name = name;
@@ -206,10 +206,11 @@ function createBusiness(name, entrancePosition, exitPosition, entrancePickupMode
tempBusinessData.exitPosition = exitPosition; tempBusinessData.exitPosition = exitPosition;
tempBusinessData.exitRotation = 0.0; tempBusinessData.exitRotation = 0.0;
tempBusinessData.exitPickupModel = exitPickupModel; tempBusinessData.exitPickupModel = 0;
tempBusinessData.exitBlipModel = exitBlipModel; tempBusinessData.exitBlipModel = -1;
tempBusinessData.exitInterior = exitInteriorId; tempBusinessData.exitInterior = 0;
tempBusinessData.exitDimension = exitVirtualWorld; tempBusinessData.exitDimension = 0;
tempBusinessData.exitCutscene = "";
return tempBusinessData; return tempBusinessData;
} }
@@ -840,7 +841,7 @@ function setBusinessInteriorTypeCommand(command, params, client) {
return false; return false;
} }
if(typeof getGameData().interiors[getGame()] == "undefined") { if(typeof getGameConfig().interiors[getGame()] == "undefined") {
messagePlayerError(client, `There are no interiors available for this game!`); messagePlayerError(client, `There are no interiors available for this game!`);
return false; return false;
} }
@@ -1513,17 +1514,23 @@ function isPlayerInAnyBusiness(client) {
* *
*/ */
function getPlayerBusiness(client) { function getPlayerBusiness(client) {
let closestEntrance = getClosestBusinessEntrance(getPlayerPosition(client), getPlayerDimension(client)); if(getPlayerDimension(client) == getGameConfig().mainWorldDimension[getGame()]) {
if(getDistance(getPlayerPosition(client), getBusinessData(closestEntrance).entrancePosition) <= getGlobalConfig().enterPropertyDistance) { let closestEntrance = getClosestBusinessEntrance(getPlayerPosition(client), getPlayerDimension(client));
return getBusinessData(closestEntrance).index; if(getDistance(getPlayerPosition(client), getBusinessData(closestEntrance).entrancePosition) <= getGlobalConfig().enterPropertyDistance) {
} return getBusinessData(closestEntrance).index;
}
} else {
let closestEntrance = getClosestBusinessEntrance(getPlayerPosition(client), getPlayerDimension(client));
if(getDistance(getPlayerPosition(client), getBusinessData(closestEntrance).entrancePosition) <= getGlobalConfig().enterPropertyDistance) {
return getBusinessData(closestEntrance).index;
}
for(let i in getServerData().businesses) { for(let i in getServerData().businesses) {
if(getServerData().businesses[i].hasInterior && getServerData().businesses[i].exitDimension == getPlayerDimension(client)) { if(getServerData().businesses[i].hasInterior && getServerData().businesses[i].exitDimension == getPlayerDimension(client)) {
return i; return i;
}
} }
} }
return -1; return -1;
} }