From 42af50a9317dfd550c06c1784c473c2d14c5fa43 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 25 Apr 2021 23:13:08 +0000
Subject: [PATCH] Remove non existent respawns from database.

---
 .../instancemanager/DBSpawnManager.java           | 15 ++++++++++++++-
 .../instancemanager/DBSpawnManager.java           | 15 ++++++++++++++-
 .../instancemanager/DBSpawnManager.java           | 15 ++++++++++++++-
 .../instancemanager/DBSpawnManager.java           | 15 ++++++++++++++-
 .../instancemanager/DBSpawnManager.java           | 15 ++++++++++++++-
 .../instancemanager/DBSpawnManager.java           | 15 ++++++++++++++-
 .../instancemanager/DBSpawnManager.java           | 15 ++++++++++++++-
 .../instancemanager/DBSpawnManager.java           | 15 ++++++++++++++-
 .../instancemanager/DBSpawnManager.java           | 15 ++++++++++++++-
 .../instancemanager/DBSpawnManager.java           | 15 ++++++++++++++-
 .../instancemanager/DBSpawnManager.java           | 15 ++++++++++++++-
 .../instancemanager/DBSpawnManager.java           | 15 ++++++++++++++-
 .../instancemanager/DBSpawnManager.java           | 15 ++++++++++++++-
 .../instancemanager/DBSpawnManager.java           | 15 ++++++++++++++-
 .../instancemanager/DBSpawnManager.java           | 15 ++++++++++++++-
 .../instancemanager/DBSpawnManager.java           | 15 ++++++++++++++-
 .../instancemanager/DBSpawnManager.java           | 15 ++++++++++++++-
 .../instancemanager/DBSpawnManager.java           | 15 ++++++++++++++-
 .../instancemanager/DBSpawnManager.java           | 15 ++++++++++++++-
 19 files changed, 266 insertions(+), 19 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index babf2e1476..6a4d356e3e 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -87,7 +87,8 @@ public class DBSpawnManager
 		{
 			while (rset.next())
 			{
-				final NpcTemplate template = getValidTemplate(rset.getInt("id"));
+				final int id = rset.getInt("id");
+				final NpcTemplate template = getValidTemplate(id);
 				if (template != null)
 				{
 					final Spawn spawn = new Spawn(template);
@@ -139,6 +140,18 @@ public class DBSpawnManager
 				else
 				{
 					LOGGER.warning(getClass().getSimpleName() + ": Could not load npc #" + rset.getInt("id") + " from DB");
+					
+					// Remove non existent NPC respawn.
+					try (Connection con2 = DatabaseFactory.getConnection();
+						PreparedStatement statement2 = con2.prepareStatement("DELETE FROM npc_respawns WHERE id=?"))
+					{
+						statement2.setInt(1, id);
+						statement2.execute();
+					}
+					catch (Exception e)
+					{
+						LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not remove npc #" + id + " from DB: ", e);
+					}
 				}
 			}
 			
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index babf2e1476..6a4d356e3e 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -87,7 +87,8 @@ public class DBSpawnManager
 		{
 			while (rset.next())
 			{
-				final NpcTemplate template = getValidTemplate(rset.getInt("id"));
+				final int id = rset.getInt("id");
+				final NpcTemplate template = getValidTemplate(id);
 				if (template != null)
 				{
 					final Spawn spawn = new Spawn(template);
@@ -139,6 +140,18 @@ public class DBSpawnManager
 				else
 				{
 					LOGGER.warning(getClass().getSimpleName() + ": Could not load npc #" + rset.getInt("id") + " from DB");
+					
+					// Remove non existent NPC respawn.
+					try (Connection con2 = DatabaseFactory.getConnection();
+						PreparedStatement statement2 = con2.prepareStatement("DELETE FROM npc_respawns WHERE id=?"))
+					{
+						statement2.setInt(1, id);
+						statement2.execute();
+					}
+					catch (Exception e)
+					{
+						LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not remove npc #" + id + " from DB: ", e);
+					}
 				}
 			}
 			
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index babf2e1476..6a4d356e3e 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -87,7 +87,8 @@ public class DBSpawnManager
 		{
 			while (rset.next())
 			{
-				final NpcTemplate template = getValidTemplate(rset.getInt("id"));
+				final int id = rset.getInt("id");
+				final NpcTemplate template = getValidTemplate(id);
 				if (template != null)
 				{
 					final Spawn spawn = new Spawn(template);
@@ -139,6 +140,18 @@ public class DBSpawnManager
 				else
 				{
 					LOGGER.warning(getClass().getSimpleName() + ": Could not load npc #" + rset.getInt("id") + " from DB");
+					
+					// Remove non existent NPC respawn.
+					try (Connection con2 = DatabaseFactory.getConnection();
+						PreparedStatement statement2 = con2.prepareStatement("DELETE FROM npc_respawns WHERE id=?"))
+					{
+						statement2.setInt(1, id);
+						statement2.execute();
+					}
+					catch (Exception e)
+					{
+						LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not remove npc #" + id + " from DB: ", e);
+					}
 				}
 			}
 			
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index babf2e1476..6a4d356e3e 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -87,7 +87,8 @@ public class DBSpawnManager
 		{
 			while (rset.next())
 			{
-				final NpcTemplate template = getValidTemplate(rset.getInt("id"));
+				final int id = rset.getInt("id");
+				final NpcTemplate template = getValidTemplate(id);
 				if (template != null)
 				{
 					final Spawn spawn = new Spawn(template);
@@ -139,6 +140,18 @@ public class DBSpawnManager
 				else
 				{
 					LOGGER.warning(getClass().getSimpleName() + ": Could not load npc #" + rset.getInt("id") + " from DB");
+					
+					// Remove non existent NPC respawn.
+					try (Connection con2 = DatabaseFactory.getConnection();
+						PreparedStatement statement2 = con2.prepareStatement("DELETE FROM npc_respawns WHERE id=?"))
+					{
+						statement2.setInt(1, id);
+						statement2.execute();
+					}
+					catch (Exception e)
+					{
+						LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not remove npc #" + id + " from DB: ", e);
+					}
 				}
 			}
 			
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index babf2e1476..6a4d356e3e 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -87,7 +87,8 @@ public class DBSpawnManager
 		{
 			while (rset.next())
 			{
-				final NpcTemplate template = getValidTemplate(rset.getInt("id"));
+				final int id = rset.getInt("id");
+				final NpcTemplate template = getValidTemplate(id);
 				if (template != null)
 				{
 					final Spawn spawn = new Spawn(template);
@@ -139,6 +140,18 @@ public class DBSpawnManager
 				else
 				{
 					LOGGER.warning(getClass().getSimpleName() + ": Could not load npc #" + rset.getInt("id") + " from DB");
+					
+					// Remove non existent NPC respawn.
+					try (Connection con2 = DatabaseFactory.getConnection();
+						PreparedStatement statement2 = con2.prepareStatement("DELETE FROM npc_respawns WHERE id=?"))
+					{
+						statement2.setInt(1, id);
+						statement2.execute();
+					}
+					catch (Exception e)
+					{
+						LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not remove npc #" + id + " from DB: ", e);
+					}
 				}
 			}
 			
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index babf2e1476..6a4d356e3e 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -87,7 +87,8 @@ public class DBSpawnManager
 		{
 			while (rset.next())
 			{
-				final NpcTemplate template = getValidTemplate(rset.getInt("id"));
+				final int id = rset.getInt("id");
+				final NpcTemplate template = getValidTemplate(id);
 				if (template != null)
 				{
 					final Spawn spawn = new Spawn(template);
@@ -139,6 +140,18 @@ public class DBSpawnManager
 				else
 				{
 					LOGGER.warning(getClass().getSimpleName() + ": Could not load npc #" + rset.getInt("id") + " from DB");
+					
+					// Remove non existent NPC respawn.
+					try (Connection con2 = DatabaseFactory.getConnection();
+						PreparedStatement statement2 = con2.prepareStatement("DELETE FROM npc_respawns WHERE id=?"))
+					{
+						statement2.setInt(1, id);
+						statement2.execute();
+					}
+					catch (Exception e)
+					{
+						LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not remove npc #" + id + " from DB: ", e);
+					}
 				}
 			}
 			
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index babf2e1476..6a4d356e3e 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -87,7 +87,8 @@ public class DBSpawnManager
 		{
 			while (rset.next())
 			{
-				final NpcTemplate template = getValidTemplate(rset.getInt("id"));
+				final int id = rset.getInt("id");
+				final NpcTemplate template = getValidTemplate(id);
 				if (template != null)
 				{
 					final Spawn spawn = new Spawn(template);
@@ -139,6 +140,18 @@ public class DBSpawnManager
 				else
 				{
 					LOGGER.warning(getClass().getSimpleName() + ": Could not load npc #" + rset.getInt("id") + " from DB");
+					
+					// Remove non existent NPC respawn.
+					try (Connection con2 = DatabaseFactory.getConnection();
+						PreparedStatement statement2 = con2.prepareStatement("DELETE FROM npc_respawns WHERE id=?"))
+					{
+						statement2.setInt(1, id);
+						statement2.execute();
+					}
+					catch (Exception e)
+					{
+						LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not remove npc #" + id + " from DB: ", e);
+					}
 				}
 			}
 			
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index babf2e1476..6a4d356e3e 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -87,7 +87,8 @@ public class DBSpawnManager
 		{
 			while (rset.next())
 			{
-				final NpcTemplate template = getValidTemplate(rset.getInt("id"));
+				final int id = rset.getInt("id");
+				final NpcTemplate template = getValidTemplate(id);
 				if (template != null)
 				{
 					final Spawn spawn = new Spawn(template);
@@ -139,6 +140,18 @@ public class DBSpawnManager
 				else
 				{
 					LOGGER.warning(getClass().getSimpleName() + ": Could not load npc #" + rset.getInt("id") + " from DB");
+					
+					// Remove non existent NPC respawn.
+					try (Connection con2 = DatabaseFactory.getConnection();
+						PreparedStatement statement2 = con2.prepareStatement("DELETE FROM npc_respawns WHERE id=?"))
+					{
+						statement2.setInt(1, id);
+						statement2.execute();
+					}
+					catch (Exception e)
+					{
+						LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not remove npc #" + id + " from DB: ", e);
+					}
 				}
 			}
 			
diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index babf2e1476..6a4d356e3e 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -87,7 +87,8 @@ public class DBSpawnManager
 		{
 			while (rset.next())
 			{
-				final NpcTemplate template = getValidTemplate(rset.getInt("id"));
+				final int id = rset.getInt("id");
+				final NpcTemplate template = getValidTemplate(id);
 				if (template != null)
 				{
 					final Spawn spawn = new Spawn(template);
@@ -139,6 +140,18 @@ public class DBSpawnManager
 				else
 				{
 					LOGGER.warning(getClass().getSimpleName() + ": Could not load npc #" + rset.getInt("id") + " from DB");
+					
+					// Remove non existent NPC respawn.
+					try (Connection con2 = DatabaseFactory.getConnection();
+						PreparedStatement statement2 = con2.prepareStatement("DELETE FROM npc_respawns WHERE id=?"))
+					{
+						statement2.setInt(1, id);
+						statement2.execute();
+					}
+					catch (Exception e)
+					{
+						LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not remove npc #" + id + " from DB: ", e);
+					}
 				}
 			}
 			
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index babf2e1476..6a4d356e3e 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -87,7 +87,8 @@ public class DBSpawnManager
 		{
 			while (rset.next())
 			{
-				final NpcTemplate template = getValidTemplate(rset.getInt("id"));
+				final int id = rset.getInt("id");
+				final NpcTemplate template = getValidTemplate(id);
 				if (template != null)
 				{
 					final Spawn spawn = new Spawn(template);
@@ -139,6 +140,18 @@ public class DBSpawnManager
 				else
 				{
 					LOGGER.warning(getClass().getSimpleName() + ": Could not load npc #" + rset.getInt("id") + " from DB");
+					
+					// Remove non existent NPC respawn.
+					try (Connection con2 = DatabaseFactory.getConnection();
+						PreparedStatement statement2 = con2.prepareStatement("DELETE FROM npc_respawns WHERE id=?"))
+					{
+						statement2.setInt(1, id);
+						statement2.execute();
+					}
+					catch (Exception e)
+					{
+						LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not remove npc #" + id + " from DB: ", e);
+					}
 				}
 			}
 			
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 babf2e1476..6a4d356e3e 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
@@ -87,7 +87,8 @@ public class DBSpawnManager
 		{
 			while (rset.next())
 			{
-				final NpcTemplate template = getValidTemplate(rset.getInt("id"));
+				final int id = rset.getInt("id");
+				final NpcTemplate template = getValidTemplate(id);
 				if (template != null)
 				{
 					final Spawn spawn = new Spawn(template);
@@ -139,6 +140,18 @@ public class DBSpawnManager
 				else
 				{
 					LOGGER.warning(getClass().getSimpleName() + ": Could not load npc #" + rset.getInt("id") + " from DB");
+					
+					// Remove non existent NPC respawn.
+					try (Connection con2 = DatabaseFactory.getConnection();
+						PreparedStatement statement2 = con2.prepareStatement("DELETE FROM npc_respawns WHERE id=?"))
+					{
+						statement2.setInt(1, id);
+						statement2.execute();
+					}
+					catch (Exception e)
+					{
+						LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not remove npc #" + id + " from DB: ", e);
+					}
 				}
 			}
 			
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 babf2e1476..6a4d356e3e 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
@@ -87,7 +87,8 @@ public class DBSpawnManager
 		{
 			while (rset.next())
 			{
-				final NpcTemplate template = getValidTemplate(rset.getInt("id"));
+				final int id = rset.getInt("id");
+				final NpcTemplate template = getValidTemplate(id);
 				if (template != null)
 				{
 					final Spawn spawn = new Spawn(template);
@@ -139,6 +140,18 @@ public class DBSpawnManager
 				else
 				{
 					LOGGER.warning(getClass().getSimpleName() + ": Could not load npc #" + rset.getInt("id") + " from DB");
+					
+					// Remove non existent NPC respawn.
+					try (Connection con2 = DatabaseFactory.getConnection();
+						PreparedStatement statement2 = con2.prepareStatement("DELETE FROM npc_respawns WHERE id=?"))
+					{
+						statement2.setInt(1, id);
+						statement2.execute();
+					}
+					catch (Exception e)
+					{
+						LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not remove npc #" + id + " from DB: ", e);
+					}
 				}
 			}
 			
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 babf2e1476..6a4d356e3e 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
@@ -87,7 +87,8 @@ public class DBSpawnManager
 		{
 			while (rset.next())
 			{
-				final NpcTemplate template = getValidTemplate(rset.getInt("id"));
+				final int id = rset.getInt("id");
+				final NpcTemplate template = getValidTemplate(id);
 				if (template != null)
 				{
 					final Spawn spawn = new Spawn(template);
@@ -139,6 +140,18 @@ public class DBSpawnManager
 				else
 				{
 					LOGGER.warning(getClass().getSimpleName() + ": Could not load npc #" + rset.getInt("id") + " from DB");
+					
+					// Remove non existent NPC respawn.
+					try (Connection con2 = DatabaseFactory.getConnection();
+						PreparedStatement statement2 = con2.prepareStatement("DELETE FROM npc_respawns WHERE id=?"))
+					{
+						statement2.setInt(1, id);
+						statement2.execute();
+					}
+					catch (Exception e)
+					{
+						LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not remove npc #" + id + " from DB: ", e);
+					}
 				}
 			}
 			
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 babf2e1476..6a4d356e3e 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
@@ -87,7 +87,8 @@ public class DBSpawnManager
 		{
 			while (rset.next())
 			{
-				final NpcTemplate template = getValidTemplate(rset.getInt("id"));
+				final int id = rset.getInt("id");
+				final NpcTemplate template = getValidTemplate(id);
 				if (template != null)
 				{
 					final Spawn spawn = new Spawn(template);
@@ -139,6 +140,18 @@ public class DBSpawnManager
 				else
 				{
 					LOGGER.warning(getClass().getSimpleName() + ": Could not load npc #" + rset.getInt("id") + " from DB");
+					
+					// Remove non existent NPC respawn.
+					try (Connection con2 = DatabaseFactory.getConnection();
+						PreparedStatement statement2 = con2.prepareStatement("DELETE FROM npc_respawns WHERE id=?"))
+					{
+						statement2.setInt(1, id);
+						statement2.execute();
+					}
+					catch (Exception e)
+					{
+						LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not remove npc #" + id + " from DB: ", e);
+					}
 				}
 			}
 			
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 babf2e1476..6a4d356e3e 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
@@ -87,7 +87,8 @@ public class DBSpawnManager
 		{
 			while (rset.next())
 			{
-				final NpcTemplate template = getValidTemplate(rset.getInt("id"));
+				final int id = rset.getInt("id");
+				final NpcTemplate template = getValidTemplate(id);
 				if (template != null)
 				{
 					final Spawn spawn = new Spawn(template);
@@ -139,6 +140,18 @@ public class DBSpawnManager
 				else
 				{
 					LOGGER.warning(getClass().getSimpleName() + ": Could not load npc #" + rset.getInt("id") + " from DB");
+					
+					// Remove non existent NPC respawn.
+					try (Connection con2 = DatabaseFactory.getConnection();
+						PreparedStatement statement2 = con2.prepareStatement("DELETE FROM npc_respawns WHERE id=?"))
+					{
+						statement2.setInt(1, id);
+						statement2.execute();
+					}
+					catch (Exception e)
+					{
+						LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not remove npc #" + id + " from DB: ", e);
+					}
 				}
 			}
 			
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 babf2e1476..6a4d356e3e 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
@@ -87,7 +87,8 @@ public class DBSpawnManager
 		{
 			while (rset.next())
 			{
-				final NpcTemplate template = getValidTemplate(rset.getInt("id"));
+				final int id = rset.getInt("id");
+				final NpcTemplate template = getValidTemplate(id);
 				if (template != null)
 				{
 					final Spawn spawn = new Spawn(template);
@@ -139,6 +140,18 @@ public class DBSpawnManager
 				else
 				{
 					LOGGER.warning(getClass().getSimpleName() + ": Could not load npc #" + rset.getInt("id") + " from DB");
+					
+					// Remove non existent NPC respawn.
+					try (Connection con2 = DatabaseFactory.getConnection();
+						PreparedStatement statement2 = con2.prepareStatement("DELETE FROM npc_respawns WHERE id=?"))
+					{
+						statement2.setInt(1, id);
+						statement2.execute();
+					}
+					catch (Exception e)
+					{
+						LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not remove npc #" + id + " from DB: ", e);
+					}
 				}
 			}
 			
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 babf2e1476..6a4d356e3e 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
@@ -87,7 +87,8 @@ public class DBSpawnManager
 		{
 			while (rset.next())
 			{
-				final NpcTemplate template = getValidTemplate(rset.getInt("id"));
+				final int id = rset.getInt("id");
+				final NpcTemplate template = getValidTemplate(id);
 				if (template != null)
 				{
 					final Spawn spawn = new Spawn(template);
@@ -139,6 +140,18 @@ public class DBSpawnManager
 				else
 				{
 					LOGGER.warning(getClass().getSimpleName() + ": Could not load npc #" + rset.getInt("id") + " from DB");
+					
+					// Remove non existent NPC respawn.
+					try (Connection con2 = DatabaseFactory.getConnection();
+						PreparedStatement statement2 = con2.prepareStatement("DELETE FROM npc_respawns WHERE id=?"))
+					{
+						statement2.setInt(1, id);
+						statement2.execute();
+					}
+					catch (Exception e)
+					{
+						LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not remove npc #" + id + " from DB: ", e);
+					}
 				}
 			}
 			
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index babf2e1476..6a4d356e3e 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -87,7 +87,8 @@ public class DBSpawnManager
 		{
 			while (rset.next())
 			{
-				final NpcTemplate template = getValidTemplate(rset.getInt("id"));
+				final int id = rset.getInt("id");
+				final NpcTemplate template = getValidTemplate(id);
 				if (template != null)
 				{
 					final Spawn spawn = new Spawn(template);
@@ -139,6 +140,18 @@ public class DBSpawnManager
 				else
 				{
 					LOGGER.warning(getClass().getSimpleName() + ": Could not load npc #" + rset.getInt("id") + " from DB");
+					
+					// Remove non existent NPC respawn.
+					try (Connection con2 = DatabaseFactory.getConnection();
+						PreparedStatement statement2 = con2.prepareStatement("DELETE FROM npc_respawns WHERE id=?"))
+					{
+						statement2.setInt(1, id);
+						statement2.execute();
+					}
+					catch (Exception e)
+					{
+						LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not remove npc #" + id + " from DB: ", e);
+					}
 				}
 			}
 			
diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index babf2e1476..6a4d356e3e 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -87,7 +87,8 @@ public class DBSpawnManager
 		{
 			while (rset.next())
 			{
-				final NpcTemplate template = getValidTemplate(rset.getInt("id"));
+				final int id = rset.getInt("id");
+				final NpcTemplate template = getValidTemplate(id);
 				if (template != null)
 				{
 					final Spawn spawn = new Spawn(template);
@@ -139,6 +140,18 @@ public class DBSpawnManager
 				else
 				{
 					LOGGER.warning(getClass().getSimpleName() + ": Could not load npc #" + rset.getInt("id") + " from DB");
+					
+					// Remove non existent NPC respawn.
+					try (Connection con2 = DatabaseFactory.getConnection();
+						PreparedStatement statement2 = con2.prepareStatement("DELETE FROM npc_respawns WHERE id=?"))
+					{
+						statement2.setInt(1, id);
+						statement2.execute();
+					}
+					catch (Exception e)
+					{
+						LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not remove npc #" + id + " from DB: ", e);
+					}
 				}
 			}