Check some game features and empty arrays

This commit is contained in:
Vortrex
2022-06-07 10:26:12 -05:00
parent 160c67c4b0
commit 2c70a6ba4d

View File

@@ -1606,6 +1606,10 @@ function isPlayerInAnyBusiness(client) {
* *
*/ */
function getPlayerBusiness(client) { function getPlayerBusiness(client) {
if (getServerData().businesses.length == 0) {
return -1;
}
if (getPlayerDimension(client) == getGameConfig().mainWorldDimension[getGame()]) { if (getPlayerDimension(client) == getGameConfig().mainWorldDimension[getGame()]) {
let closestEntrance = getClosestBusinessEntrance(getPlayerPosition(client), getPlayerDimension(client)); let closestEntrance = getClosestBusinessEntrance(getPlayerPosition(client), getPlayerDimension(client));
if (getDistance(getPlayerPosition(client), getBusinessData(closestEntrance).entrancePosition) <= getGlobalConfig().enterPropertyDistance) { if (getDistance(getPlayerPosition(client), getBusinessData(closestEntrance).entrancePosition) <= getGlobalConfig().enterPropertyDistance) {
@@ -1738,6 +1742,10 @@ function createAllBusinessPickups() {
return false; return false;
} }
if (!isGameFeatureSupported("pickups")) {
return false;
}
for (let i in getServerData().businesses) { for (let i in getServerData().businesses) {
createBusinessEntrancePickup(i); createBusinessEntrancePickup(i);
createBusinessExitPickup(i); createBusinessExitPickup(i);
@@ -1760,6 +1768,10 @@ function createAllBusinessBlips() {
return false; return false;
} }
if (!isGameFeatureSupported("blips")) {
return false;
}
for (let i in getServerData().businesses) { for (let i in getServerData().businesses) {
createBusinessEntranceBlip(i); createBusinessEntranceBlip(i);
createBusinessExitBlip(i); createBusinessExitBlip(i);
@@ -1784,6 +1796,10 @@ function createBusinessEntrancePickup(businessId) {
return false; return false;
} }
if (!isGameFeatureSupported("pickups")) {
return false;
}
let businessData = getBusinessData(businessId); let businessData = getBusinessData(businessId);
//if(businessData.hasInterior) { //if(businessData.hasInterior) {
@@ -1844,10 +1860,18 @@ function createBusinessEntrancePickup(businessId) {
* *
*/ */
function createBusinessEntranceBlip(businessId) { function createBusinessEntranceBlip(businessId) {
if (!areServerElementsSupported()) {
return false;
}
if (!getServerConfig().createBusinessBlips) { if (!getServerConfig().createBusinessBlips) {
return false; return false;
} }
if (!isGameFeatureSupported("blips")) {
return false;
}
let businessData = getBusinessData(businessId); let businessData = getBusinessData(businessId);
//if(businessData.hasInterior) { //if(businessData.hasInterior) {
@@ -1906,6 +1930,10 @@ function createBusinessExitPickup(businessId) {
return false; return false;
} }
if (!isGameFeatureSupported("pickups")) {
return false;
}
let businessData = getBusinessData(businessId); let businessData = getBusinessData(businessId);
//if(!businessData.hasInterior) { //if(!businessData.hasInterior) {
@@ -1963,6 +1991,10 @@ function createBusinessExitBlip(businessId) {
return false; return false;
} }
if (!isGameFeatureSupported("blips")) {
return false;
}
let businessData = getBusinessData(businessId); let businessData = getBusinessData(businessId);
//if(!businessData.hasInterior) { //if(!businessData.hasInterior) {
@@ -2010,7 +2042,7 @@ function createBusinessExitBlip(businessId) {
* @return {Boolean} Whether or not the business was deleted * @return {Boolean} Whether or not the business was deleted
* *
*/ */
function deleteBusiness(businessId, deletedBy = 0) { function deleteBusiness(businessId, whoDeleted = 0) {
let tempBusinessData = getServerData().businesses[businessId]; let tempBusinessData = getServerData().businesses[businessId];
let dbConnection = connectToDatabase(); let dbConnection = connectToDatabase();
@@ -2020,7 +2052,7 @@ function deleteBusiness(businessId, deletedBy = 0) {
deleteBusinessPickups(businessId); deleteBusinessPickups(businessId);
if (dbConnection) { if (dbConnection) {
dbQuery = queryDatabase(dbConnection, `DELETE FROM biz_main WHERE biz_id = ${tempBusinessData.databaseId}`); dbQuery = queryDatabase(dbConnection, `UPDATE biz_main WHERE biz_deleted = 1, biz_when_deleted = UNIX_TIMESTAMP(), biz_who_deleted = ${whoDeleted} WHERE biz_id ${tempBusinessData.databaseId}`);
if (dbQuery) { if (dbQuery) {
freeDatabaseQuery(dbQuery); freeDatabaseQuery(dbQuery);
} }
@@ -2160,6 +2192,10 @@ function deleteBusinessEntrancePickup(businessId) {
return false; return false;
} }
if (!isGameFeatureSupported("pickups")) {
return false;
}
if (getBusinessData(businessId).entrancePickup != null) { if (getBusinessData(businessId).entrancePickup != null) {
//removeFromWorld(getBusinessData(businessId).entrancePickup); //removeFromWorld(getBusinessData(businessId).entrancePickup);
deleteGameElement(getBusinessData(businessId).entrancePickup); deleteGameElement(getBusinessData(businessId).entrancePickup);
@@ -2183,6 +2219,10 @@ function deleteBusinessExitPickup(businessId) {
return false; return false;
} }
if (!isGameFeatureSupported("pickups")) {
return false;
}
if (getBusinessData(businessId).exitPickup != null) { if (getBusinessData(businessId).exitPickup != null) {
//removeFromWorld(getBusinessData(businessId).exitPickup); //removeFromWorld(getBusinessData(businessId).exitPickup);
deleteGameElement(getBusinessData(businessId).exitPickup); deleteGameElement(getBusinessData(businessId).exitPickup);
@@ -2202,6 +2242,10 @@ function deleteBusinessEntranceBlip(businessId) {
return false; return false;
} }
if (!isGameFeatureSupported("blips")) {
return false;
}
if (getBusinessData(businessId).entranceBlip != null) { if (getBusinessData(businessId).entranceBlip != null) {
//removeFromWorld(getBusinessData(businessId).entranceBlip); //removeFromWorld(getBusinessData(businessId).entranceBlip);
deleteGameElement(getBusinessData(businessId).entranceBlip); deleteGameElement(getBusinessData(businessId).entranceBlip);
@@ -2221,6 +2265,10 @@ function deleteBusinessExitBlip(businessId) {
return false; return false;
} }
if (!isGameFeatureSupported("blip")) {
return false;
}
if (getBusinessData(businessId).exitBlip != null) { if (getBusinessData(businessId).exitBlip != null) {
//removeFromWorld(getBusinessData(businessId).exitBlip); //removeFromWorld(getBusinessData(businessId).exitBlip);
deleteGameElement(getBusinessData(businessId).exitBlip); deleteGameElement(getBusinessData(businessId).exitBlip);