diff --git a/scripts/server/business.js b/scripts/server/business.js index 00a44d5f..ede76ab8 100644 --- a/scripts/server/business.js +++ b/scripts/server/business.js @@ -1308,14 +1308,12 @@ function deleteBusiness(businessId, deletedBy = 0) { disconnectFromDatabase(dbConnection); } - deleteBusinessEntrancePickup(businessId); - deleteBusinessExitPickup(businessId); - deleteBusinessEntranceBlip(businessId); - deleteBusinessExitBlip(businessId); + deleteAllBusinessBlips(businessId); + deleteAllBusinessPickups(businessId); removePlayersFromBusiness(businessId); - getServerData().businesses[businessId] = false; + getServerData().businesses.splice(businessId, 1); } // =========================================================================== @@ -1809,8 +1807,7 @@ function getBusinessIdFromDatabaseId(databaseId) { // =========================================================================== function resetBusinessPickups(businessId) { - deleteBusinessEntrancePickup(businessId); - deleteBusinessExitPickup(businessId); + deleteBusinessPickups(businessId); createBusinessEntrancePickup(businessId); createBusinessExitPickup(businessId); } @@ -1818,8 +1815,7 @@ function resetBusinessPickups(businessId) { // =========================================================================== function resetBusinessBlips(businessId) { - deleteBusinessEntranceBlip(businessId); - deleteBusinessExitBlip(businessId); + deleteBusinessBlips(businessId); createBusinessEntranceBlip(businessId); createBusinessExitBlip(businessId); } @@ -1945,4 +1941,19 @@ function canPlayerManageBusiness(client, businessId) { return false; } -// =========================================================================== \ No newline at end of file +// =========================================================================== + +function deleteBusinessBlips(business) { + deleteBusinessExitBlip(business); + deleteBusinessEntranceBlip(business); +} + +// =========================================================================== + +function deleteBusinessPickups(business) { + deleteBusinessExitPickup(business); + deleteBusinessEntrancePickup(business); +} + +// =========================================================================== + diff --git a/scripts/server/house.js b/scripts/server/house.js index 912a8820..a905a23d 100644 --- a/scripts/server/house.js +++ b/scripts/server/house.js @@ -591,7 +591,7 @@ function deleteHouse(houseId, whoDeleted = 0) { removePlayersFromHouse(houseId); - getServerData().houses[houseId] = false; + getServerData().houses.splice(houseId, 1); } // ===========================================================================