From 732cce121909015d6cff27a21f0cb1d02cd291c5 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 27 Jun 2021 22:54:34 +0000
Subject: [PATCH] Kastia instance reset checks and addition of teleporter.
 Contributed by manax182.

---
 .../{ => Kastia}/KastiaExceptional.xml        |  5 +-
 .../data/instances/Kastia}/KastiaExtreme.xml  |  5 +-
 .../data/instances/Kastia}/KastiaHard.xml     |  5 +-
 .../game/data/instances/Kastia}/KastiaLow.xml |  5 +-
 .../instances/{ => Kastia}/KastiaMedium.xml   |  5 +-
 .../ai/others/KastiaResearcher/34566.html     |  5 ++
 .../KastiaResearcher/KastiaResearcher.java    | 58 +++++++++++++++++++
 .../KastiaExceptional/KastiaExceptional.java  | 20 +++++--
 .../KastiaExtreme/KastiaExtreme.java          | 20 +++++--
 .../instances/KastiaHard/KastiaHard.java      | 20 +++++--
 .../instances/KastiaLow/KastiaLow.java        | 20 +++++--
 .../instances/KastiaMedium/KastiaMedium.java  | 20 +++++--
 .../{ => Kastia}/KastiaExceptional.xml        |  5 +-
 .../data/instances/Kastia}/KastiaExtreme.xml  |  5 +-
 .../data/instances/Kastia}/KastiaHard.xml     |  5 +-
 .../game/data/instances/Kastia}/KastiaLow.xml |  5 +-
 .../instances/{ => Kastia}/KastiaMedium.xml   |  5 +-
 .../ai/others/KastiaResearcher/34566.html     |  5 ++
 .../KastiaResearcher/KastiaResearcher.java    | 58 +++++++++++++++++++
 .../KastiaExceptional/KastiaExceptional.java  | 20 +++++--
 .../KastiaExtreme/KastiaExtreme.java          | 20 +++++--
 .../instances/KastiaHard/KastiaHard.java      | 20 +++++--
 .../instances/KastiaLow/KastiaLow.java        | 20 +++++--
 .../instances/KastiaMedium/KastiaMedium.java  | 20 +++++--
 24 files changed, 326 insertions(+), 50 deletions(-)
 rename L2J_Mobius_8.0_Homunculus/dist/game/data/instances/{ => Kastia}/KastiaExceptional.xml (94%)
 rename {L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances => L2J_Mobius_8.0_Homunculus/dist/game/data/instances/Kastia}/KastiaExtreme.xml (94%)
 rename {L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances => L2J_Mobius_8.0_Homunculus/dist/game/data/instances/Kastia}/KastiaHard.xml (94%)
 rename {L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances => L2J_Mobius_8.0_Homunculus/dist/game/data/instances/Kastia}/KastiaLow.xml (94%)
 rename L2J_Mobius_8.0_Homunculus/dist/game/data/instances/{ => Kastia}/KastiaMedium.xml (94%)
 create mode 100644 L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/KastiaResearcher/34566.html
 create mode 100644 L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/KastiaResearcher/KastiaResearcher.java
 rename L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/{ => Kastia}/KastiaExceptional.xml (94%)
 rename {L2J_Mobius_8.0_Homunculus/dist/game/data/instances => L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/Kastia}/KastiaExtreme.xml (94%)
 rename {L2J_Mobius_8.0_Homunculus/dist/game/data/instances => L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/Kastia}/KastiaHard.xml (94%)
 rename {L2J_Mobius_8.0_Homunculus/dist/game/data/instances => L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/Kastia}/KastiaLow.xml (94%)
 rename L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/{ => Kastia}/KastiaMedium.xml (94%)
 create mode 100644 L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/KastiaResearcher/34566.html
 create mode 100644 L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/KastiaResearcher/KastiaResearcher.java

diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/instances/KastiaExceptional.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/instances/Kastia/KastiaExceptional.xml
similarity index 94%
rename from L2J_Mobius_8.0_Homunculus/dist/game/data/instances/KastiaExceptional.xml
rename to L2J_Mobius_8.0_Homunculus/dist/game/data/instances/Kastia/KastiaExceptional.xml
index b410082fca..4176b3d079 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/instances/KastiaExceptional.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/instances/Kastia/KastiaExceptional.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Kastia - Exceptional -->
-<instance id="305" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+<instance id="305" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
 	<time duration="15" empty="0" />
 	<locations>
 		<enter type="FIXED">
@@ -26,6 +26,9 @@
 		<reset day="SUNDAY" hour="6" minute="30" />
 	</reenter>
 	<spawnlist>
+		<group name="NPC" spawnByDefault="false">
+			<npc id="34566" x="-111304" y="-15018" z="-11430" heading="48879" /> <!-- Kastia's Researcher -->
+		</group>
 		<group name="wave_1" spawnByDefault="false">
 			<npc id="24588" x="-111432" y="-14392" z="-11428" heading="16526" /> <!-- Kastia's Keeper -->
 			<npc id="24588" x="-111368" y="-14376" z="-11428" heading="2854" /> <!-- Kastia's Keeper -->
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/KastiaExtreme.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/instances/Kastia/KastiaExtreme.xml
similarity index 94%
rename from L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/KastiaExtreme.xml
rename to L2J_Mobius_8.0_Homunculus/dist/game/data/instances/Kastia/KastiaExtreme.xml
index b36c147df1..77eea03d01 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/KastiaExtreme.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/instances/Kastia/KastiaExtreme.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Kastia - Extreme -->
-<instance id="306" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+<instance id="306" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
 	<time duration="15" empty="0" />
 	<locations>
 		<enter type="FIXED">
@@ -26,6 +26,9 @@
 		<reset day="SUNDAY" hour="6" minute="30" />
 	</reenter>
 	<spawnlist>
+		<group name="NPC" spawnByDefault="false">
+			<npc id="34566" x="-111304" y="-15018" z="-11430" heading="48879" /> <!-- Kastia's Researcher -->
+		</group>
 		<group name="wave_1" spawnByDefault="false">
 			<npc id="24592" x="-111432" y="-14392" z="-11428" heading="16526" /> <!-- Kastia's Keeper -->
 			<npc id="24592" x="-111368" y="-14376" z="-11428" heading="2854" /> <!-- Kastia's Keeper -->
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/KastiaHard.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/instances/Kastia/KastiaHard.xml
similarity index 94%
rename from L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/KastiaHard.xml
rename to L2J_Mobius_8.0_Homunculus/dist/game/data/instances/Kastia/KastiaHard.xml
index 5ed80451f9..eb724d09e5 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/KastiaHard.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/instances/Kastia/KastiaHard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Kastia - Hard -->
-<instance id="300" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+<instance id="300" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
 	<time duration="15" empty="0" />
 	<locations>
 		<enter type="FIXED">
@@ -26,6 +26,9 @@
 		<reset day="SUNDAY" hour="6" minute="30" />
 	</reenter>
 	<spawnlist>
+		<group name="NPC" spawnByDefault="false">
+			<npc id="34566" x="-111304" y="-15018" z="-11430" heading="48879" /> <!-- Kastia's Researcher -->
+		</group>
 		<group name="wave_1" spawnByDefault="false">
 			<npc id="24543" x="-111432" y="-14392" z="-11428" heading="16526" /> <!-- Kastia's Keeper -->
 			<npc id="24543" x="-111368" y="-14376" z="-11428" heading="2854" /> <!-- Kastia's Keeper -->
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/KastiaLow.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/instances/Kastia/KastiaLow.xml
similarity index 94%
rename from L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/KastiaLow.xml
rename to L2J_Mobius_8.0_Homunculus/dist/game/data/instances/Kastia/KastiaLow.xml
index 0eb704aeeb..343da01acb 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/KastiaLow.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/instances/Kastia/KastiaLow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Kastia - Low -->
-<instance id="298" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+<instance id="298" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
 	<time duration="15" empty="0" />
 	<locations>
 		<enter type="FIXED">
@@ -26,6 +26,9 @@
 		<reset day="SUNDAY" hour="6" minute="30" />
 	</reenter>
 	<spawnlist>
+		<group name="NPC" spawnByDefault="false">
+			<npc id="34566" x="-111304" y="-15018" z="-11430" heading="48879" /> <!-- Kastia's Researcher -->
+		</group>
 		<group name="wave_1" spawnByDefault="false">
 			<npc id="24535" x="-111432" y="-14392" z="-11428" heading="16526" /> <!-- Kastia's Keeper -->
 			<npc id="24535" x="-111368" y="-14376" z="-11428" heading="2854" /> <!-- Kastia's Keeper -->
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/instances/KastiaMedium.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/instances/Kastia/KastiaMedium.xml
similarity index 94%
rename from L2J_Mobius_8.0_Homunculus/dist/game/data/instances/KastiaMedium.xml
rename to L2J_Mobius_8.0_Homunculus/dist/game/data/instances/Kastia/KastiaMedium.xml
index 800a5010b5..688fdbdadd 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/instances/KastiaMedium.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/instances/Kastia/KastiaMedium.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Kastia - Medium -->
-<instance id="299" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+<instance id="299" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
 	<time duration="15" empty="0" />
 	<locations>
 		<enter type="FIXED">
@@ -26,6 +26,9 @@
 		<reset day="SUNDAY" hour="6" minute="30" />
 	</reenter>
 	<spawnlist>
+		<group name="NPC" spawnByDefault="false">
+			<npc id="34566" x="-111304" y="-15018" z="-11430" heading="48879" /> <!-- Kastia's Researcher -->
+		</group>
 		<group name="wave_1" spawnByDefault="false">
 			<npc id="24539" x="-111432" y="-14392" z="-11428" heading="16526" /> <!-- Kastia's Keeper -->
 			<npc id="24539" x="-111368" y="-14376" z="-11428" heading="2854" /> <!-- Kastia's Keeper -->
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/KastiaResearcher/34566.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/KastiaResearcher/34566.html
new file mode 100644
index 0000000000..e14794d409
--- /dev/null
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/KastiaResearcher/34566.html
@@ -0,0 +1,5 @@
+<html><body>Kastia's Researcher:<br>
+I'm a researcher from the kingdom of Aden.<br>
+I came here hoping to solve the mysteries of the Kastias's Labyrinth. Thanks to you I was finally able to make some progress. As a sign of my gratitude I will show you the exit.<br>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest KastiaResearcher exit">Go outside</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/KastiaResearcher/KastiaResearcher.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/KastiaResearcher/KastiaResearcher.java
new file mode 100644
index 0000000000..9c030c5174
--- /dev/null
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/KastiaResearcher/KastiaResearcher.java
@@ -0,0 +1,58 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ai.others.KastiaResearcher;
+
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.instancezone.Instance;
+
+import ai.AbstractNpcAI;
+
+/**
+ * @author Mobius
+ */
+public class KastiaResearcher extends AbstractNpcAI
+{
+	// NPC
+	private static final int RESEARCHER = 34566;
+	
+	public KastiaResearcher()
+	{
+		addStartNpc(RESEARCHER);
+		addTalkId(RESEARCHER);
+		addFirstTalkId(RESEARCHER);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+	{
+		if (event.equals("exit"))
+		{
+			final Instance world = player.getInstanceWorld();
+			if (world != null)
+			{
+				world.finishInstance(0);
+			}
+		}
+		return null;
+	}
+	
+	public static void main(String[] args)
+	{
+		new KastiaResearcher();
+	}
+}
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java
index f9185f1130..e164501e53 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java
@@ -16,12 +16,16 @@
  */
 package instances.KastiaExceptional;
 
+import org.l2jmobius.commons.util.Chronos;
+import org.l2jmobius.gameserver.instancemanager.InstanceManager;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.network.NpcStringId;
+import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
+import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 import instances.AbstractInstance;
 
@@ -60,10 +64,17 @@ public class KastiaExceptional extends AbstractInstance
 		{
 			case "enterInstance":
 			{
-				/*
-				 * Cannot enter if player finished another Kastia instance. if ((Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, 299)) || (Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, 298))) { player.sendPacket(new
-				 * SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(player.getName())); return null; }
-				 */
+				// Cannot enter if player finished another Kastia instance.
+				final long currentTime = Chronos.currentTimeMillis();
+				if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 298)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 299)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 300)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 306)))
+				{
+					player.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(player.getName()));
+					return null;
+				}
+				
 				enterInstance(player, npc, TEMPLATE_ID);
 				if (player.getInstanceWorld() != null)
 				{
@@ -158,6 +169,7 @@ public class KastiaExceptional extends AbstractInstance
 					{
 						if (world.getAliveNpcs().isEmpty())
 						{
+							world.spawnGroup("NPC");
 							giveItems(player, KASTIAS_LV4_PACK);
 							world.finishInstance();
 						}
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java
index bd1741c006..d805f981f1 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java
@@ -16,12 +16,16 @@
  */
 package instances.KastiaExtreme;
 
+import org.l2jmobius.commons.util.Chronos;
+import org.l2jmobius.gameserver.instancemanager.InstanceManager;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.network.NpcStringId;
+import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
+import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 import instances.AbstractInstance;
 
@@ -60,10 +64,17 @@ public class KastiaExtreme extends AbstractInstance
 		{
 			case "enterInstance":
 			{
-				/*
-				 * Cannot enter if player finished another Kastia instance. if ((Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, 299)) || (Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, 298))) { player.sendPacket(new
-				 * SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(player.getName())); return null; }
-				 */
+				// Cannot enter if player finished another Kastia instance.
+				final long currentTime = Chronos.currentTimeMillis();
+				if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 298)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 299)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 300)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 305)))
+				{
+					player.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(player.getName()));
+					return null;
+				}
+				
 				enterInstance(player, npc, TEMPLATE_ID);
 				if (player.getInstanceWorld() != null)
 				{
@@ -158,6 +169,7 @@ public class KastiaExtreme extends AbstractInstance
 					{
 						if (world.getAliveNpcs().isEmpty())
 						{
+							world.spawnGroup("NPC");
 							giveItems(player, KASTIAS_LV5_PACK);
 							world.finishInstance();
 						}
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java
index 391ef994f6..258e74b3e7 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java
@@ -16,12 +16,16 @@
  */
 package instances.KastiaHard;
 
+import org.l2jmobius.commons.util.Chronos;
+import org.l2jmobius.gameserver.instancemanager.InstanceManager;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.network.NpcStringId;
+import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
+import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 import instances.AbstractInstance;
 
@@ -60,10 +64,17 @@ public class KastiaHard extends AbstractInstance
 		{
 			case "enterInstance":
 			{
-				/*
-				 * Cannot enter if player finished another Kastia instance. if ((Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, 299)) || (Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, 298))) { player.sendPacket(new
-				 * SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(player.getName())); return null; }
-				 */
+				// Cannot enter if player finished another Kastia instance.
+				final long currentTime = Chronos.currentTimeMillis();
+				if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 298)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 299)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 305)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 306)))
+				{
+					player.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(player.getName()));
+					return null;
+				}
+				
 				enterInstance(player, npc, TEMPLATE_ID);
 				if (player.getInstanceWorld() != null)
 				{
@@ -158,6 +169,7 @@ public class KastiaHard extends AbstractInstance
 					{
 						if (world.getAliveNpcs().isEmpty())
 						{
+							world.spawnGroup("NPC");
 							giveItems(player, KASTIAS_LARGE_PACK);
 							world.finishInstance();
 						}
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java
index 503a6ef507..68b262a47b 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java
@@ -16,12 +16,16 @@
  */
 package instances.KastiaLow;
 
+import org.l2jmobius.commons.util.Chronos;
+import org.l2jmobius.gameserver.instancemanager.InstanceManager;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.network.NpcStringId;
+import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
+import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 import instances.AbstractInstance;
 
@@ -60,10 +64,17 @@ public class KastiaLow extends AbstractInstance
 		{
 			case "enterInstance":
 			{
-				/*
-				 * Cannot enter if player finished another Kastia instance. if ((Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, 299)) || (Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, 298))) { player.sendPacket(new
-				 * SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(player.getName())); return null; }
-				 */
+				// Cannot enter if player finished another Kastia instance.
+				final long currentTime = Chronos.currentTimeMillis();
+				if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 299)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 300)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 305)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 306)))
+				{
+					player.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(player.getName()));
+					return null;
+				}
+				
 				enterInstance(player, npc, TEMPLATE_ID);
 				if (player.getInstanceWorld() != null)
 				{
@@ -158,6 +169,7 @@ public class KastiaLow extends AbstractInstance
 					{
 						if (world.getAliveNpcs().isEmpty())
 						{
+							world.spawnGroup("NPC");
 							giveItems(player, KASTIAS_SMALL_PACK);
 							world.finishInstance();
 						}
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java
index 1d474c09d4..4c3e8e5cc0 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java
@@ -16,12 +16,16 @@
  */
 package instances.KastiaMedium;
 
+import org.l2jmobius.commons.util.Chronos;
+import org.l2jmobius.gameserver.instancemanager.InstanceManager;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.network.NpcStringId;
+import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
+import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 import instances.AbstractInstance;
 
@@ -60,10 +64,17 @@ public class KastiaMedium extends AbstractInstance
 		{
 			case "enterInstance":
 			{
-				/*
-				 * Cannot enter if player finished another Kastia instance. if ((Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, 299)) || (Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, 298))) { player.sendPacket(new
-				 * SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(player.getName())); return null; }
-				 */
+				// Cannot enter if player finished another Kastia instance.
+				final long currentTime = Chronos.currentTimeMillis();
+				if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 298)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 300)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 305)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 306)))
+				{
+					player.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(player.getName()));
+					return null;
+				}
+				
 				enterInstance(player, npc, TEMPLATE_ID);
 				if (player.getInstanceWorld() != null)
 				{
@@ -158,6 +169,7 @@ public class KastiaMedium extends AbstractInstance
 					{
 						if (world.getAliveNpcs().isEmpty())
 						{
+							world.spawnGroup("NPC");
 							giveItems(player, KASTIAS_MEDIUM_PACK);
 							world.finishInstance();
 						}
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/KastiaExceptional.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/Kastia/KastiaExceptional.xml
similarity index 94%
rename from L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/KastiaExceptional.xml
rename to L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/Kastia/KastiaExceptional.xml
index b410082fca..4176b3d079 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/KastiaExceptional.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/Kastia/KastiaExceptional.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Kastia - Exceptional -->
-<instance id="305" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+<instance id="305" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
 	<time duration="15" empty="0" />
 	<locations>
 		<enter type="FIXED">
@@ -26,6 +26,9 @@
 		<reset day="SUNDAY" hour="6" minute="30" />
 	</reenter>
 	<spawnlist>
+		<group name="NPC" spawnByDefault="false">
+			<npc id="34566" x="-111304" y="-15018" z="-11430" heading="48879" /> <!-- Kastia's Researcher -->
+		</group>
 		<group name="wave_1" spawnByDefault="false">
 			<npc id="24588" x="-111432" y="-14392" z="-11428" heading="16526" /> <!-- Kastia's Keeper -->
 			<npc id="24588" x="-111368" y="-14376" z="-11428" heading="2854" /> <!-- Kastia's Keeper -->
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/instances/KastiaExtreme.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/Kastia/KastiaExtreme.xml
similarity index 94%
rename from L2J_Mobius_8.0_Homunculus/dist/game/data/instances/KastiaExtreme.xml
rename to L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/Kastia/KastiaExtreme.xml
index b36c147df1..77eea03d01 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/instances/KastiaExtreme.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/Kastia/KastiaExtreme.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Kastia - Extreme -->
-<instance id="306" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+<instance id="306" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
 	<time duration="15" empty="0" />
 	<locations>
 		<enter type="FIXED">
@@ -26,6 +26,9 @@
 		<reset day="SUNDAY" hour="6" minute="30" />
 	</reenter>
 	<spawnlist>
+		<group name="NPC" spawnByDefault="false">
+			<npc id="34566" x="-111304" y="-15018" z="-11430" heading="48879" /> <!-- Kastia's Researcher -->
+		</group>
 		<group name="wave_1" spawnByDefault="false">
 			<npc id="24592" x="-111432" y="-14392" z="-11428" heading="16526" /> <!-- Kastia's Keeper -->
 			<npc id="24592" x="-111368" y="-14376" z="-11428" heading="2854" /> <!-- Kastia's Keeper -->
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/instances/KastiaHard.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/Kastia/KastiaHard.xml
similarity index 94%
rename from L2J_Mobius_8.0_Homunculus/dist/game/data/instances/KastiaHard.xml
rename to L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/Kastia/KastiaHard.xml
index 5ed80451f9..eb724d09e5 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/instances/KastiaHard.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/Kastia/KastiaHard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Kastia - Hard -->
-<instance id="300" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+<instance id="300" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
 	<time duration="15" empty="0" />
 	<locations>
 		<enter type="FIXED">
@@ -26,6 +26,9 @@
 		<reset day="SUNDAY" hour="6" minute="30" />
 	</reenter>
 	<spawnlist>
+		<group name="NPC" spawnByDefault="false">
+			<npc id="34566" x="-111304" y="-15018" z="-11430" heading="48879" /> <!-- Kastia's Researcher -->
+		</group>
 		<group name="wave_1" spawnByDefault="false">
 			<npc id="24543" x="-111432" y="-14392" z="-11428" heading="16526" /> <!-- Kastia's Keeper -->
 			<npc id="24543" x="-111368" y="-14376" z="-11428" heading="2854" /> <!-- Kastia's Keeper -->
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/instances/KastiaLow.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/Kastia/KastiaLow.xml
similarity index 94%
rename from L2J_Mobius_8.0_Homunculus/dist/game/data/instances/KastiaLow.xml
rename to L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/Kastia/KastiaLow.xml
index 0eb704aeeb..343da01acb 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/instances/KastiaLow.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/Kastia/KastiaLow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Kastia - Low -->
-<instance id="298" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+<instance id="298" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
 	<time duration="15" empty="0" />
 	<locations>
 		<enter type="FIXED">
@@ -26,6 +26,9 @@
 		<reset day="SUNDAY" hour="6" minute="30" />
 	</reenter>
 	<spawnlist>
+		<group name="NPC" spawnByDefault="false">
+			<npc id="34566" x="-111304" y="-15018" z="-11430" heading="48879" /> <!-- Kastia's Researcher -->
+		</group>
 		<group name="wave_1" spawnByDefault="false">
 			<npc id="24535" x="-111432" y="-14392" z="-11428" heading="16526" /> <!-- Kastia's Keeper -->
 			<npc id="24535" x="-111368" y="-14376" z="-11428" heading="2854" /> <!-- Kastia's Keeper -->
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/KastiaMedium.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/Kastia/KastiaMedium.xml
similarity index 94%
rename from L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/KastiaMedium.xml
rename to L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/Kastia/KastiaMedium.xml
index 800a5010b5..688fdbdadd 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/KastiaMedium.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/Kastia/KastiaMedium.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Kastia - Medium -->
-<instance id="299" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+<instance id="299" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
 	<time duration="15" empty="0" />
 	<locations>
 		<enter type="FIXED">
@@ -26,6 +26,9 @@
 		<reset day="SUNDAY" hour="6" minute="30" />
 	</reenter>
 	<spawnlist>
+		<group name="NPC" spawnByDefault="false">
+			<npc id="34566" x="-111304" y="-15018" z="-11430" heading="48879" /> <!-- Kastia's Researcher -->
+		</group>
 		<group name="wave_1" spawnByDefault="false">
 			<npc id="24539" x="-111432" y="-14392" z="-11428" heading="16526" /> <!-- Kastia's Keeper -->
 			<npc id="24539" x="-111368" y="-14376" z="-11428" heading="2854" /> <!-- Kastia's Keeper -->
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/KastiaResearcher/34566.html b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/KastiaResearcher/34566.html
new file mode 100644
index 0000000000..e14794d409
--- /dev/null
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/KastiaResearcher/34566.html
@@ -0,0 +1,5 @@
+<html><body>Kastia's Researcher:<br>
+I'm a researcher from the kingdom of Aden.<br>
+I came here hoping to solve the mysteries of the Kastias's Labyrinth. Thanks to you I was finally able to make some progress. As a sign of my gratitude I will show you the exit.<br>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest KastiaResearcher exit">Go outside</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/KastiaResearcher/KastiaResearcher.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/KastiaResearcher/KastiaResearcher.java
new file mode 100644
index 0000000000..9c030c5174
--- /dev/null
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/KastiaResearcher/KastiaResearcher.java
@@ -0,0 +1,58 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ai.others.KastiaResearcher;
+
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.instancezone.Instance;
+
+import ai.AbstractNpcAI;
+
+/**
+ * @author Mobius
+ */
+public class KastiaResearcher extends AbstractNpcAI
+{
+	// NPC
+	private static final int RESEARCHER = 34566;
+	
+	public KastiaResearcher()
+	{
+		addStartNpc(RESEARCHER);
+		addTalkId(RESEARCHER);
+		addFirstTalkId(RESEARCHER);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+	{
+		if (event.equals("exit"))
+		{
+			final Instance world = player.getInstanceWorld();
+			if (world != null)
+			{
+				world.finishInstance(0);
+			}
+		}
+		return null;
+	}
+	
+	public static void main(String[] args)
+	{
+		new KastiaResearcher();
+	}
+}
\ No newline at end of file
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java
index f9185f1130..e164501e53 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java
@@ -16,12 +16,16 @@
  */
 package instances.KastiaExceptional;
 
+import org.l2jmobius.commons.util.Chronos;
+import org.l2jmobius.gameserver.instancemanager.InstanceManager;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.network.NpcStringId;
+import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
+import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 import instances.AbstractInstance;
 
@@ -60,10 +64,17 @@ public class KastiaExceptional extends AbstractInstance
 		{
 			case "enterInstance":
 			{
-				/*
-				 * Cannot enter if player finished another Kastia instance. if ((Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, 299)) || (Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, 298))) { player.sendPacket(new
-				 * SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(player.getName())); return null; }
-				 */
+				// Cannot enter if player finished another Kastia instance.
+				final long currentTime = Chronos.currentTimeMillis();
+				if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 298)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 299)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 300)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 306)))
+				{
+					player.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(player.getName()));
+					return null;
+				}
+				
 				enterInstance(player, npc, TEMPLATE_ID);
 				if (player.getInstanceWorld() != null)
 				{
@@ -158,6 +169,7 @@ public class KastiaExceptional extends AbstractInstance
 					{
 						if (world.getAliveNpcs().isEmpty())
 						{
+							world.spawnGroup("NPC");
 							giveItems(player, KASTIAS_LV4_PACK);
 							world.finishInstance();
 						}
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java
index bd1741c006..d805f981f1 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java
@@ -16,12 +16,16 @@
  */
 package instances.KastiaExtreme;
 
+import org.l2jmobius.commons.util.Chronos;
+import org.l2jmobius.gameserver.instancemanager.InstanceManager;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.network.NpcStringId;
+import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
+import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 import instances.AbstractInstance;
 
@@ -60,10 +64,17 @@ public class KastiaExtreme extends AbstractInstance
 		{
 			case "enterInstance":
 			{
-				/*
-				 * Cannot enter if player finished another Kastia instance. if ((Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, 299)) || (Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, 298))) { player.sendPacket(new
-				 * SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(player.getName())); return null; }
-				 */
+				// Cannot enter if player finished another Kastia instance.
+				final long currentTime = Chronos.currentTimeMillis();
+				if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 298)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 299)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 300)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 305)))
+				{
+					player.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(player.getName()));
+					return null;
+				}
+				
 				enterInstance(player, npc, TEMPLATE_ID);
 				if (player.getInstanceWorld() != null)
 				{
@@ -158,6 +169,7 @@ public class KastiaExtreme extends AbstractInstance
 					{
 						if (world.getAliveNpcs().isEmpty())
 						{
+							world.spawnGroup("NPC");
 							giveItems(player, KASTIAS_LV5_PACK);
 							world.finishInstance();
 						}
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java
index 391ef994f6..258e74b3e7 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java
@@ -16,12 +16,16 @@
  */
 package instances.KastiaHard;
 
+import org.l2jmobius.commons.util.Chronos;
+import org.l2jmobius.gameserver.instancemanager.InstanceManager;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.network.NpcStringId;
+import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
+import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 import instances.AbstractInstance;
 
@@ -60,10 +64,17 @@ public class KastiaHard extends AbstractInstance
 		{
 			case "enterInstance":
 			{
-				/*
-				 * Cannot enter if player finished another Kastia instance. if ((Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, 299)) || (Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, 298))) { player.sendPacket(new
-				 * SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(player.getName())); return null; }
-				 */
+				// Cannot enter if player finished another Kastia instance.
+				final long currentTime = Chronos.currentTimeMillis();
+				if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 298)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 299)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 305)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 306)))
+				{
+					player.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(player.getName()));
+					return null;
+				}
+				
 				enterInstance(player, npc, TEMPLATE_ID);
 				if (player.getInstanceWorld() != null)
 				{
@@ -158,6 +169,7 @@ public class KastiaHard extends AbstractInstance
 					{
 						if (world.getAliveNpcs().isEmpty())
 						{
+							world.spawnGroup("NPC");
 							giveItems(player, KASTIAS_LARGE_PACK);
 							world.finishInstance();
 						}
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java
index 503a6ef507..68b262a47b 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java
@@ -16,12 +16,16 @@
  */
 package instances.KastiaLow;
 
+import org.l2jmobius.commons.util.Chronos;
+import org.l2jmobius.gameserver.instancemanager.InstanceManager;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.network.NpcStringId;
+import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
+import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 import instances.AbstractInstance;
 
@@ -60,10 +64,17 @@ public class KastiaLow extends AbstractInstance
 		{
 			case "enterInstance":
 			{
-				/*
-				 * Cannot enter if player finished another Kastia instance. if ((Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, 299)) || (Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, 298))) { player.sendPacket(new
-				 * SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(player.getName())); return null; }
-				 */
+				// Cannot enter if player finished another Kastia instance.
+				final long currentTime = Chronos.currentTimeMillis();
+				if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 299)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 300)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 305)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 306)))
+				{
+					player.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(player.getName()));
+					return null;
+				}
+				
 				enterInstance(player, npc, TEMPLATE_ID);
 				if (player.getInstanceWorld() != null)
 				{
@@ -158,6 +169,7 @@ public class KastiaLow extends AbstractInstance
 					{
 						if (world.getAliveNpcs().isEmpty())
 						{
+							world.spawnGroup("NPC");
 							giveItems(player, KASTIAS_SMALL_PACK);
 							world.finishInstance();
 						}
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java
index 1d474c09d4..4c3e8e5cc0 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java
@@ -16,12 +16,16 @@
  */
 package instances.KastiaMedium;
 
+import org.l2jmobius.commons.util.Chronos;
+import org.l2jmobius.gameserver.instancemanager.InstanceManager;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.network.NpcStringId;
+import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
+import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 import instances.AbstractInstance;
 
@@ -60,10 +64,17 @@ public class KastiaMedium extends AbstractInstance
 		{
 			case "enterInstance":
 			{
-				/*
-				 * Cannot enter if player finished another Kastia instance. if ((Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, 299)) || (Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, 298))) { player.sendPacket(new
-				 * SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(player.getName())); return null; }
-				 */
+				// Cannot enter if player finished another Kastia instance.
+				final long currentTime = Chronos.currentTimeMillis();
+				if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 298)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 300)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 305)) //
+					|| (currentTime < InstanceManager.getInstance().getInstanceTime(player, 306)))
+				{
+					player.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(player.getName()));
+					return null;
+				}
+				
 				enterInstance(player, npc, TEMPLATE_ID);
 				if (player.getInstanceWorld() != null)
 				{
@@ -158,6 +169,7 @@ public class KastiaMedium extends AbstractInstance
 					{
 						if (world.getAliveNpcs().isEmpty())
 						{
+							world.spawnGroup("NPC");
 							giveItems(player, KASTIAS_MEDIUM_PACK);
 							world.finishInstance();
 						}