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

Use getPlayerBusiness for checking if in one

Browse Source
This commit is contained in:
Vortrex
2022-05-11 04:00:38 -05:00
parent 7a7ef0f5af
commit 2fbf15fcf7
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/server/business.js
View File

@@ -163,7 +163,7 @@ function createBusinessLocationCommand(command, params, client) {
} }
let locationType = toString(getParam(params, " ", 1)); let locationType = toString(getParam(params, " ", 1));
let businessId = (isPlayerInAnyBusiness(getParam(params, " ", 2))) ? getPlayerBusiness(client) : getClosestBusinessEntrance(getPlayerPosition(client)); let businessId = getPlayerBusiness(client);
if(!areParamsEmpty(params)) { if(!areParamsEmpty(params)) {
businessId = getBusinessFromParams(params); businessId = getBusinessFromParams(params);
@@ -1892,10 +1892,8 @@ function deleteBusiness(businessId, deletedBy = 0) {
function removePlayersFromBusiness(businessId) { function removePlayersFromBusiness(businessId) {
getClients().forEach(function(client) { getClients().forEach(function(client) {
if(doesBusinessHaveInterior(businessId)) { if(doesBusinessHaveInterior(businessId)) {
if(isPlayerInAnyBusiness(client)) { if(getPlayerBusiness(client) == businessId) {
if(getPlayerBusiness(client) == businessId) { exitBusiness(client);
exitBusiness(client);
}
} }
} }
}); });
@@ -1912,12 +1910,8 @@ function removePlayersFromBusiness(businessId) {
* @return {Boolean} Whether or not the player was forced to exit * @return {Boolean} Whether or not the player was forced to exit
* *
*/ */
function removePlayerFromBusinesses(client) { function removePlayerFromBusiness(client) {
if(isPlayerInAnyBusiness(client)) { exitBusiness(client);
exitBusiness(client);
return true;
}
return false; return false;
} }
@@ -2094,9 +2088,7 @@ function deleteBusinessExitBlip(businessId) {
function reloadAllBusinessesCommand(command, params, client) { function reloadAllBusinessesCommand(command, params, client) {
let clients = getClients(); let clients = getClients();
for(let i in clients) { for(let i in clients) {
if(isPlayerInAnyBusiness(clients[i])) { removePlayerFromBusiness(clients[i]);
removePlayerFromBusinesses(clients[i]);
}
} }
for(let i in getServerData().businesses) { for(let i in getServerData().businesses) {