From c70ee9f745d66e3dfdd2354d46854495c97eb93a Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 1 May 2021 08:50:38 +0000
Subject: [PATCH] Small fix for ToH instances. Contributed by CostyKiller.

---
 .../instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java  | 3 +--
 .../instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java  | 8 ++------
 .../instances/ThroneOfHeroes/ThroneOfHeroesTauti.java     | 8 ++------
 .../instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java  | 3 +--
 .../instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java  | 8 ++------
 .../instances/ThroneOfHeroes/ThroneOfHeroesTauti.java     | 8 ++------
 6 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java
index 96e31f5beb..744187c7db 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java
@@ -44,7 +44,6 @@ public class ThroneOfHeroesGoldberg extends AbstractInstance
 	};
 	// Throne's Treasure Chest Goldberg
 	private static final int TREASURE_CHEST = 26455;
-	
 	// Misc
 	private static final int TEMPLATE_ID = 307;
 	
@@ -62,7 +61,6 @@ public class ThroneOfHeroesGoldberg extends AbstractInstance
 	public void onInstanceCreated(Instance activeInstance, PlayerInstance player)
 	{
 		activeInstance.setStatus(0);
-		startQuestTimer("ANNOUNCE_RAID_START", 10000, null, player);
 	}
 	
 	@Override
@@ -73,6 +71,7 @@ public class ThroneOfHeroesGoldberg extends AbstractInstance
 			case "enterInstance":
 			{
 				enterInstance(player, npc, TEMPLATE_ID);
+				startQuestTimer("ANNOUNCE_RAID_START", 10000, null, player);
 				break;
 			}
 			case "reenterInstance":
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java
index b279ff4446..6cea4dd4ff 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java
@@ -30,20 +30,16 @@ import instances.AbstractInstance;
  */
 public class ThroneOfHeroesMaryReed extends AbstractInstance
 {
-	
 	// NPCs
 	private static final int ROIENTAL = 34571;
 	// Monsters
 	private static final int MARY_REED = 26267;
 	private static final int MARY_REED_MINION_ZAKEN = 26255;
-	
 	// Throne's Treasure Chest Mary Reed
 	private static final int TREASURE_CHEST = 26456;
-	
 	// Misc
 	private static final int TEMPLATE_ID = 308;
-	
-	// Npc Dialogs
+	// NPC dialogs
 	private static final NpcStringId[] ZAKEN_MESSAGES =
 	{
 		NpcStringId.MARY_REED_THEY_ARE_JUST_INSECTS_HAHA_SHOW_THEM_YOUR_TRUE_POWER,
@@ -66,7 +62,6 @@ public class ThroneOfHeroesMaryReed extends AbstractInstance
 	public void onInstanceCreated(Instance activeInstance, PlayerInstance player)
 	{
 		activeInstance.setStatus(0);
-		startQuestTimer("ANNOUNCE_RAID_START", 10000, null, player);
 	}
 	
 	@Override
@@ -77,6 +72,7 @@ public class ThroneOfHeroesMaryReed extends AbstractInstance
 			case "enterInstance":
 			{
 				enterInstance(player, npc, TEMPLATE_ID);
+				startQuestTimer("ANNOUNCE_RAID_START", 10000, null, player);
 				break;
 			}
 			case "reenterInstance":
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java
index 72797bd3cd..1e930873f7 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java
@@ -30,19 +30,15 @@ import instances.AbstractInstance;
  */
 public class ThroneOfHeroesTauti extends AbstractInstance
 {
-	
 	// NPCs
 	private static final int ROIENTAL = 34571;
 	// Monsters
 	private static final int TAUTI = 26266;
-	
 	// Throne's Treasure Chest Tauti
 	private static final int TREASURE_CHEST = 26457;
-	
 	// Misc
 	private static final int TEMPLATE_ID = 309;
-	
-	// Npc Dialogs
+	// NPC dialogs
 	private static final NpcStringId[] TAUTI_MESSAGES =
 	{
 		NpcStringId.TAUTI_INTENDS_TO_SHOW_OFF_HIS_POWER_TO_HIS_FOLLOWERS,
@@ -63,7 +59,6 @@ public class ThroneOfHeroesTauti extends AbstractInstance
 	public void onInstanceCreated(Instance activeInstance, PlayerInstance player)
 	{
 		activeInstance.setStatus(0);
-		startQuestTimer("ANNOUNCE_RAID_START", 10000, null, player);
 	}
 	
 	@Override
@@ -74,6 +69,7 @@ public class ThroneOfHeroesTauti extends AbstractInstance
 			case "enterInstance":
 			{
 				enterInstance(player, npc, TEMPLATE_ID);
+				startQuestTimer("ANNOUNCE_RAID_START", 10000, null, player);
 				break;
 			}
 			case "reenterInstance":
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java
index 96e31f5beb..744187c7db 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java
@@ -44,7 +44,6 @@ public class ThroneOfHeroesGoldberg extends AbstractInstance
 	};
 	// Throne's Treasure Chest Goldberg
 	private static final int TREASURE_CHEST = 26455;
-	
 	// Misc
 	private static final int TEMPLATE_ID = 307;
 	
@@ -62,7 +61,6 @@ public class ThroneOfHeroesGoldberg extends AbstractInstance
 	public void onInstanceCreated(Instance activeInstance, PlayerInstance player)
 	{
 		activeInstance.setStatus(0);
-		startQuestTimer("ANNOUNCE_RAID_START", 10000, null, player);
 	}
 	
 	@Override
@@ -73,6 +71,7 @@ public class ThroneOfHeroesGoldberg extends AbstractInstance
 			case "enterInstance":
 			{
 				enterInstance(player, npc, TEMPLATE_ID);
+				startQuestTimer("ANNOUNCE_RAID_START", 10000, null, player);
 				break;
 			}
 			case "reenterInstance":
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java
index b279ff4446..6cea4dd4ff 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java
@@ -30,20 +30,16 @@ import instances.AbstractInstance;
  */
 public class ThroneOfHeroesMaryReed extends AbstractInstance
 {
-	
 	// NPCs
 	private static final int ROIENTAL = 34571;
 	// Monsters
 	private static final int MARY_REED = 26267;
 	private static final int MARY_REED_MINION_ZAKEN = 26255;
-	
 	// Throne's Treasure Chest Mary Reed
 	private static final int TREASURE_CHEST = 26456;
-	
 	// Misc
 	private static final int TEMPLATE_ID = 308;
-	
-	// Npc Dialogs
+	// NPC dialogs
 	private static final NpcStringId[] ZAKEN_MESSAGES =
 	{
 		NpcStringId.MARY_REED_THEY_ARE_JUST_INSECTS_HAHA_SHOW_THEM_YOUR_TRUE_POWER,
@@ -66,7 +62,6 @@ public class ThroneOfHeroesMaryReed extends AbstractInstance
 	public void onInstanceCreated(Instance activeInstance, PlayerInstance player)
 	{
 		activeInstance.setStatus(0);
-		startQuestTimer("ANNOUNCE_RAID_START", 10000, null, player);
 	}
 	
 	@Override
@@ -77,6 +72,7 @@ public class ThroneOfHeroesMaryReed extends AbstractInstance
 			case "enterInstance":
 			{
 				enterInstance(player, npc, TEMPLATE_ID);
+				startQuestTimer("ANNOUNCE_RAID_START", 10000, null, player);
 				break;
 			}
 			case "reenterInstance":
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java
index 72797bd3cd..1e930873f7 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java
@@ -30,19 +30,15 @@ import instances.AbstractInstance;
  */
 public class ThroneOfHeroesTauti extends AbstractInstance
 {
-	
 	// NPCs
 	private static final int ROIENTAL = 34571;
 	// Monsters
 	private static final int TAUTI = 26266;
-	
 	// Throne's Treasure Chest Tauti
 	private static final int TREASURE_CHEST = 26457;
-	
 	// Misc
 	private static final int TEMPLATE_ID = 309;
-	
-	// Npc Dialogs
+	// NPC dialogs
 	private static final NpcStringId[] TAUTI_MESSAGES =
 	{
 		NpcStringId.TAUTI_INTENDS_TO_SHOW_OFF_HIS_POWER_TO_HIS_FOLLOWERS,
@@ -63,7 +59,6 @@ public class ThroneOfHeroesTauti extends AbstractInstance
 	public void onInstanceCreated(Instance activeInstance, PlayerInstance player)
 	{
 		activeInstance.setStatus(0);
-		startQuestTimer("ANNOUNCE_RAID_START", 10000, null, player);
 	}
 	
 	@Override
@@ -74,6 +69,7 @@ public class ThroneOfHeroesTauti extends AbstractInstance
 			case "enterInstance":
 			{
 				enterInstance(player, npc, TEMPLATE_ID);
+				startQuestTimer("ANNOUNCE_RAID_START", 10000, null, player);
 				break;
 			}
 			case "reenterInstance":