From f2ffffe9c1d516946eadc2f7bfedf4b83a5bb85c Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 14 Jul 2020 13:30:14 +0000
Subject: [PATCH] Remove previous Toma spawns.

---
 .../data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java    | 7 ++++++-
 .../data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java    | 7 ++++++-
 .../data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java    | 7 ++++++-
 .../data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java    | 7 ++++++-
 .../data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java    | 7 ++++++-
 .../data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java    | 7 ++++++-
 .../data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java    | 7 ++++++-
 .../data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java    | 7 ++++++-
 .../data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java    | 7 ++++++-
 9 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
index c204be3822..39e260aac9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
@@ -38,6 +38,7 @@ public class Toma extends AbstractNpcAI
 	};
 	// Misc
 	private static final int TELEPORT_DELAY = 1800000; // 30 minutes
+	private static Npc _toma;
 	
 	private Toma()
 	{
@@ -51,7 +52,11 @@ public class Toma extends AbstractNpcAI
 	{
 		if (event.equals("RESPAWN_TOMA"))
 		{
-			addSpawn(TOMA, getRandomEntry(LOCATIONS), false, TELEPORT_DELAY);
+			if (_toma != null)
+			{
+				_toma.deleteMe();
+			}
+			_toma = addSpawn(TOMA, getRandomEntry(LOCATIONS), false, TELEPORT_DELAY);
 		}
 		return null;
 	}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
index c204be3822..39e260aac9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
@@ -38,6 +38,7 @@ public class Toma extends AbstractNpcAI
 	};
 	// Misc
 	private static final int TELEPORT_DELAY = 1800000; // 30 minutes
+	private static Npc _toma;
 	
 	private Toma()
 	{
@@ -51,7 +52,11 @@ public class Toma extends AbstractNpcAI
 	{
 		if (event.equals("RESPAWN_TOMA"))
 		{
-			addSpawn(TOMA, getRandomEntry(LOCATIONS), false, TELEPORT_DELAY);
+			if (_toma != null)
+			{
+				_toma.deleteMe();
+			}
+			_toma = addSpawn(TOMA, getRandomEntry(LOCATIONS), false, TELEPORT_DELAY);
 		}
 		return null;
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
index c204be3822..39e260aac9 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
@@ -38,6 +38,7 @@ public class Toma extends AbstractNpcAI
 	};
 	// Misc
 	private static final int TELEPORT_DELAY = 1800000; // 30 minutes
+	private static Npc _toma;
 	
 	private Toma()
 	{
@@ -51,7 +52,11 @@ public class Toma extends AbstractNpcAI
 	{
 		if (event.equals("RESPAWN_TOMA"))
 		{
-			addSpawn(TOMA, getRandomEntry(LOCATIONS), false, TELEPORT_DELAY);
+			if (_toma != null)
+			{
+				_toma.deleteMe();
+			}
+			_toma = addSpawn(TOMA, getRandomEntry(LOCATIONS), false, TELEPORT_DELAY);
 		}
 		return null;
 	}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
index c204be3822..39e260aac9 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
@@ -38,6 +38,7 @@ public class Toma extends AbstractNpcAI
 	};
 	// Misc
 	private static final int TELEPORT_DELAY = 1800000; // 30 minutes
+	private static Npc _toma;
 	
 	private Toma()
 	{
@@ -51,7 +52,11 @@ public class Toma extends AbstractNpcAI
 	{
 		if (event.equals("RESPAWN_TOMA"))
 		{
-			addSpawn(TOMA, getRandomEntry(LOCATIONS), false, TELEPORT_DELAY);
+			if (_toma != null)
+			{
+				_toma.deleteMe();
+			}
+			_toma = addSpawn(TOMA, getRandomEntry(LOCATIONS), false, TELEPORT_DELAY);
 		}
 		return null;
 	}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
index c204be3822..39e260aac9 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
@@ -38,6 +38,7 @@ public class Toma extends AbstractNpcAI
 	};
 	// Misc
 	private static final int TELEPORT_DELAY = 1800000; // 30 minutes
+	private static Npc _toma;
 	
 	private Toma()
 	{
@@ -51,7 +52,11 @@ public class Toma extends AbstractNpcAI
 	{
 		if (event.equals("RESPAWN_TOMA"))
 		{
-			addSpawn(TOMA, getRandomEntry(LOCATIONS), false, TELEPORT_DELAY);
+			if (_toma != null)
+			{
+				_toma.deleteMe();
+			}
+			_toma = addSpawn(TOMA, getRandomEntry(LOCATIONS), false, TELEPORT_DELAY);
 		}
 		return null;
 	}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
index c204be3822..39e260aac9 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
@@ -38,6 +38,7 @@ public class Toma extends AbstractNpcAI
 	};
 	// Misc
 	private static final int TELEPORT_DELAY = 1800000; // 30 minutes
+	private static Npc _toma;
 	
 	private Toma()
 	{
@@ -51,7 +52,11 @@ public class Toma extends AbstractNpcAI
 	{
 		if (event.equals("RESPAWN_TOMA"))
 		{
-			addSpawn(TOMA, getRandomEntry(LOCATIONS), false, TELEPORT_DELAY);
+			if (_toma != null)
+			{
+				_toma.deleteMe();
+			}
+			_toma = addSpawn(TOMA, getRandomEntry(LOCATIONS), false, TELEPORT_DELAY);
 		}
 		return null;
 	}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
index c204be3822..39e260aac9 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
@@ -38,6 +38,7 @@ public class Toma extends AbstractNpcAI
 	};
 	// Misc
 	private static final int TELEPORT_DELAY = 1800000; // 30 minutes
+	private static Npc _toma;
 	
 	private Toma()
 	{
@@ -51,7 +52,11 @@ public class Toma extends AbstractNpcAI
 	{
 		if (event.equals("RESPAWN_TOMA"))
 		{
-			addSpawn(TOMA, getRandomEntry(LOCATIONS), false, TELEPORT_DELAY);
+			if (_toma != null)
+			{
+				_toma.deleteMe();
+			}
+			_toma = addSpawn(TOMA, getRandomEntry(LOCATIONS), false, TELEPORT_DELAY);
 		}
 		return null;
 	}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
index c204be3822..39e260aac9 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
@@ -38,6 +38,7 @@ public class Toma extends AbstractNpcAI
 	};
 	// Misc
 	private static final int TELEPORT_DELAY = 1800000; // 30 minutes
+	private static Npc _toma;
 	
 	private Toma()
 	{
@@ -51,7 +52,11 @@ public class Toma extends AbstractNpcAI
 	{
 		if (event.equals("RESPAWN_TOMA"))
 		{
-			addSpawn(TOMA, getRandomEntry(LOCATIONS), false, TELEPORT_DELAY);
+			if (_toma != null)
+			{
+				_toma.deleteMe();
+			}
+			_toma = addSpawn(TOMA, getRandomEntry(LOCATIONS), false, TELEPORT_DELAY);
 		}
 		return null;
 	}
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
index c204be3822..39e260aac9 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
@@ -38,6 +38,7 @@ public class Toma extends AbstractNpcAI
 	};
 	// Misc
 	private static final int TELEPORT_DELAY = 1800000; // 30 minutes
+	private static Npc _toma;
 	
 	private Toma()
 	{
@@ -51,7 +52,11 @@ public class Toma extends AbstractNpcAI
 	{
 		if (event.equals("RESPAWN_TOMA"))
 		{
-			addSpawn(TOMA, getRandomEntry(LOCATIONS), false, TELEPORT_DELAY);
+			if (_toma != null)
+			{
+				_toma.deleteMe();
+			}
+			_toma = addSpawn(TOMA, getRandomEntry(LOCATIONS), false, TELEPORT_DELAY);
 		}
 		return null;
 	}