From dbc0d906d0f64a1f330ee36323a2afeccdf718de Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 22 Feb 2022 22:10:32 +0000
Subject: [PATCH] Remove spawns on DBSpawnManager load.

---
 .../gameserver/instancemanager/DBSpawnManager.java        | 8 ++++++++
 .../gameserver/instancemanager/DBSpawnManager.java        | 8 ++++++++
 .../gameserver/instancemanager/DBSpawnManager.java        | 8 ++++++++
 .../gameserver/instancemanager/DBSpawnManager.java        | 8 ++++++++
 .../gameserver/instancemanager/DBSpawnManager.java        | 8 ++++++++
 .../gameserver/instancemanager/DBSpawnManager.java        | 8 ++++++++
 .../gameserver/instancemanager/DBSpawnManager.java        | 8 ++++++++
 .../gameserver/instancemanager/DBSpawnManager.java        | 8 ++++++++
 .../gameserver/instancemanager/DBSpawnManager.java        | 8 ++++++++
 .../gameserver/instancemanager/DBSpawnManager.java        | 8 ++++++++
 .../gameserver/instancemanager/DBSpawnManager.java        | 8 ++++++++
 .../gameserver/instancemanager/RaidBossSpawnManager.java  | 8 ++++++++
 .../gameserver/instancemanager/RaidBossSpawnManager.java  | 8 ++++++++
 .../gameserver/instancemanager/RaidBossSpawnManager.java  | 8 ++++++++
 .../gameserver/instancemanager/RaidBossSpawnManager.java  | 8 ++++++++
 .../gameserver/instancemanager/DBSpawnManager.java        | 8 ++++++++
 .../gameserver/instancemanager/DBSpawnManager.java        | 8 ++++++++
 .../gameserver/instancemanager/DBSpawnManager.java        | 8 ++++++++
 .../gameserver/instancemanager/DBSpawnManager.java        | 8 ++++++++
 .../gameserver/instancemanager/DBSpawnManager.java        | 8 ++++++++
 .../gameserver/instancemanager/DBSpawnManager.java        | 8 ++++++++
 .../gameserver/instancemanager/DBSpawnManager.java        | 8 ++++++++
 .../gameserver/instancemanager/DBSpawnManager.java        | 8 ++++++++
 .../gameserver/instancemanager/DBSpawnManager.java        | 8 ++++++++
 .../gameserver/instancemanager/DBSpawnManager.java        | 8 ++++++++
 25 files changed, 200 insertions(+)

diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 2a6fe4c09f..205d211014 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -76,6 +76,14 @@ public class DBSpawnManager
 			return;
 		}
 		
+		if (!_spawns.isEmpty())
+		{
+			for (Spawn spawn : _spawns.values())
+			{
+				deleteSpawn(spawn, false);
+			}
+		}
+		
 		_npcs.clear();
 		_spawns.clear();
 		_storedInfo.clear();
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 2a6fe4c09f..205d211014 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -76,6 +76,14 @@ public class DBSpawnManager
 			return;
 		}
 		
+		if (!_spawns.isEmpty())
+		{
+			for (Spawn spawn : _spawns.values())
+			{
+				deleteSpawn(spawn, false);
+			}
+		}
+		
 		_npcs.clear();
 		_spawns.clear();
 		_storedInfo.clear();
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 2a6fe4c09f..205d211014 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -76,6 +76,14 @@ public class DBSpawnManager
 			return;
 		}
 		
+		if (!_spawns.isEmpty())
+		{
+			for (Spawn spawn : _spawns.values())
+			{
+				deleteSpawn(spawn, false);
+			}
+		}
+		
 		_npcs.clear();
 		_spawns.clear();
 		_storedInfo.clear();
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 2a6fe4c09f..205d211014 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -76,6 +76,14 @@ public class DBSpawnManager
 			return;
 		}
 		
+		if (!_spawns.isEmpty())
+		{
+			for (Spawn spawn : _spawns.values())
+			{
+				deleteSpawn(spawn, false);
+			}
+		}
+		
 		_npcs.clear();
 		_spawns.clear();
 		_storedInfo.clear();
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 2a6fe4c09f..205d211014 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -76,6 +76,14 @@ public class DBSpawnManager
 			return;
 		}
 		
+		if (!_spawns.isEmpty())
+		{
+			for (Spawn spawn : _spawns.values())
+			{
+				deleteSpawn(spawn, false);
+			}
+		}
+		
 		_npcs.clear();
 		_spawns.clear();
 		_storedInfo.clear();
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 2a6fe4c09f..205d211014 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -76,6 +76,14 @@ public class DBSpawnManager
 			return;
 		}
 		
+		if (!_spawns.isEmpty())
+		{
+			for (Spawn spawn : _spawns.values())
+			{
+				deleteSpawn(spawn, false);
+			}
+		}
+		
 		_npcs.clear();
 		_spawns.clear();
 		_storedInfo.clear();
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 2a6fe4c09f..205d211014 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -76,6 +76,14 @@ public class DBSpawnManager
 			return;
 		}
 		
+		if (!_spawns.isEmpty())
+		{
+			for (Spawn spawn : _spawns.values())
+			{
+				deleteSpawn(spawn, false);
+			}
+		}
+		
 		_npcs.clear();
 		_spawns.clear();
 		_storedInfo.clear();
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 2a6fe4c09f..205d211014 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -76,6 +76,14 @@ public class DBSpawnManager
 			return;
 		}
 		
+		if (!_spawns.isEmpty())
+		{
+			for (Spawn spawn : _spawns.values())
+			{
+				deleteSpawn(spawn, false);
+			}
+		}
+		
 		_npcs.clear();
 		_spawns.clear();
 		_storedInfo.clear();
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 2a6fe4c09f..205d211014 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -76,6 +76,14 @@ public class DBSpawnManager
 			return;
 		}
 		
+		if (!_spawns.isEmpty())
+		{
+			for (Spawn spawn : _spawns.values())
+			{
+				deleteSpawn(spawn, false);
+			}
+		}
+		
 		_npcs.clear();
 		_spawns.clear();
 		_storedInfo.clear();
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 2a6fe4c09f..205d211014 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -76,6 +76,14 @@ public class DBSpawnManager
 			return;
 		}
 		
+		if (!_spawns.isEmpty())
+		{
+			for (Spawn spawn : _spawns.values())
+			{
+				deleteSpawn(spawn, false);
+			}
+		}
+		
 		_npcs.clear();
 		_spawns.clear();
 		_storedInfo.clear();
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 2a6fe4c09f..205d211014 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -76,6 +76,14 @@ public class DBSpawnManager
 			return;
 		}
 		
+		if (!_spawns.isEmpty())
+		{
+			for (Spawn spawn : _spawns.values())
+			{
+				deleteSpawn(spawn, false);
+			}
+		}
+		
 		_npcs.clear();
 		_spawns.clear();
 		_storedInfo.clear();
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java
index 16abbc577f..ce576bac95 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java
@@ -68,6 +68,14 @@ public class RaidBossSpawnManager
 	 */
 	public void load()
 	{
+		if (!_spawns.isEmpty())
+		{
+			for (Spawn spawn : _spawns.values())
+			{
+				deleteSpawn(spawn, false);
+			}
+		}
+		
 		_bosses.clear();
 		_spawns.clear();
 		_storedInfo.clear();
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java
index 16abbc577f..ce576bac95 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java
@@ -68,6 +68,14 @@ public class RaidBossSpawnManager
 	 */
 	public void load()
 	{
+		if (!_spawns.isEmpty())
+		{
+			for (Spawn spawn : _spawns.values())
+			{
+				deleteSpawn(spawn, false);
+			}
+		}
+		
 		_bosses.clear();
 		_spawns.clear();
 		_storedInfo.clear();
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java
index e57f5d0b60..1d8f50df16 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java
@@ -65,6 +65,14 @@ public class RaidBossSpawnManager
 	 */
 	public void load()
 	{
+		if (!_spawns.isEmpty())
+		{
+			for (Spawn spawn : _spawns.values())
+			{
+				deleteSpawn(spawn, false);
+			}
+		}
+		
 		_bosses.clear();
 		_spawns.clear();
 		_storedInfo.clear();
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java
index e57f5d0b60..1d8f50df16 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java
@@ -65,6 +65,14 @@ public class RaidBossSpawnManager
 	 */
 	public void load()
 	{
+		if (!_spawns.isEmpty())
+		{
+			for (Spawn spawn : _spawns.values())
+			{
+				deleteSpawn(spawn, false);
+			}
+		}
+		
 		_bosses.clear();
 		_spawns.clear();
 		_storedInfo.clear();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 2a6fe4c09f..205d211014 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -76,6 +76,14 @@ public class DBSpawnManager
 			return;
 		}
 		
+		if (!_spawns.isEmpty())
+		{
+			for (Spawn spawn : _spawns.values())
+			{
+				deleteSpawn(spawn, false);
+			}
+		}
+		
 		_npcs.clear();
 		_spawns.clear();
 		_storedInfo.clear();
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 2a6fe4c09f..205d211014 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -76,6 +76,14 @@ public class DBSpawnManager
 			return;
 		}
 		
+		if (!_spawns.isEmpty())
+		{
+			for (Spawn spawn : _spawns.values())
+			{
+				deleteSpawn(spawn, false);
+			}
+		}
+		
 		_npcs.clear();
 		_spawns.clear();
 		_storedInfo.clear();
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 2a6fe4c09f..205d211014 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -76,6 +76,14 @@ public class DBSpawnManager
 			return;
 		}
 		
+		if (!_spawns.isEmpty())
+		{
+			for (Spawn spawn : _spawns.values())
+			{
+				deleteSpawn(spawn, false);
+			}
+		}
+		
 		_npcs.clear();
 		_spawns.clear();
 		_storedInfo.clear();
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 2a6fe4c09f..205d211014 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -76,6 +76,14 @@ public class DBSpawnManager
 			return;
 		}
 		
+		if (!_spawns.isEmpty())
+		{
+			for (Spawn spawn : _spawns.values())
+			{
+				deleteSpawn(spawn, false);
+			}
+		}
+		
 		_npcs.clear();
 		_spawns.clear();
 		_storedInfo.clear();
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 2a6fe4c09f..205d211014 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -76,6 +76,14 @@ public class DBSpawnManager
 			return;
 		}
 		
+		if (!_spawns.isEmpty())
+		{
+			for (Spawn spawn : _spawns.values())
+			{
+				deleteSpawn(spawn, false);
+			}
+		}
+		
 		_npcs.clear();
 		_spawns.clear();
 		_storedInfo.clear();
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 2a6fe4c09f..205d211014 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -76,6 +76,14 @@ public class DBSpawnManager
 			return;
 		}
 		
+		if (!_spawns.isEmpty())
+		{
+			for (Spawn spawn : _spawns.values())
+			{
+				deleteSpawn(spawn, false);
+			}
+		}
+		
 		_npcs.clear();
 		_spawns.clear();
 		_storedInfo.clear();
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 2a6fe4c09f..205d211014 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -76,6 +76,14 @@ public class DBSpawnManager
 			return;
 		}
 		
+		if (!_spawns.isEmpty())
+		{
+			for (Spawn spawn : _spawns.values())
+			{
+				deleteSpawn(spawn, false);
+			}
+		}
+		
 		_npcs.clear();
 		_spawns.clear();
 		_storedInfo.clear();
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 2a6fe4c09f..205d211014 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -76,6 +76,14 @@ public class DBSpawnManager
 			return;
 		}
 		
+		if (!_spawns.isEmpty())
+		{
+			for (Spawn spawn : _spawns.values())
+			{
+				deleteSpawn(spawn, false);
+			}
+		}
+		
 		_npcs.clear();
 		_spawns.clear();
 		_storedInfo.clear();
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 2a6fe4c09f..205d211014 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -76,6 +76,14 @@ public class DBSpawnManager
 			return;
 		}
 		
+		if (!_spawns.isEmpty())
+		{
+			for (Spawn spawn : _spawns.values())
+			{
+				deleteSpawn(spawn, false);
+			}
+		}
+		
 		_npcs.clear();
 		_spawns.clear();
 		_storedInfo.clear();
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 2a6fe4c09f..205d211014 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -76,6 +76,14 @@ public class DBSpawnManager
 			return;
 		}
 		
+		if (!_spawns.isEmpty())
+		{
+			for (Spawn spawn : _spawns.values())
+			{
+				deleteSpawn(spawn, false);
+			}
+		}
+		
 		_npcs.clear();
 		_spawns.clear();
 		_storedInfo.clear();