diff --git a/scripts/server/startup.js b/scripts/server/startup.js index 2dc41af7..214353d6 100644 --- a/scripts/server/startup.js +++ b/scripts/server/startup.js @@ -8,6 +8,7 @@ // =========================================================================== function initServerScripts() { + serverStarting = true; checkForAllRequiredModules(); initDatabaseScript(); @@ -50,13 +51,14 @@ function initServerScripts() { setAllServerDataIndexes(); checkServerGameTime(); - spawnAllServerElements(); + addAllNetworkEventHandlers(); addAllCommandHandlers(); initAllClients(); initTimers(); serverStartTime = getCurrentUnixTimestamp(); + serverStarting = false; } // =========================================================================== @@ -196,6 +198,23 @@ function spawnAllServerElements() { // =========================================================================== +function despawnAllServerElements() { + //despawnAllBusinessPickups(); + //despawnAllBusinessBlips(); + //despawnAllHousePickups(); + //despawnAllHouseBlips(); + //despawnAllJobPickups(); + //despawnAllJobBlips(); + //despawnAllGroundItemObjects(); + despawnAllVehicles(); + despawnAllNPCs(); + + // Using client-side spheres since server-side ones don't show on GTAC atm (bug) + //createAllJobRouteLocationMarkers(); +} + +// =========================================================================== + initServerScripts(); // =========================================================================== \ No newline at end of file