From f9d6f9eff3c4fb1400ae5dc25d51b0a075199c24 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Wed, 1 Mar 2023 01:18:06 -0600
Subject: [PATCH] Despawn all elements util + starting state

---
 scripts/server/startup.js | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

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