From 834f89797bd9711ab066bb6174f7113301978ee8 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 22 Sep 2022 22:00:39 +0000
Subject: [PATCH] Enable re-entry at Training Zone instance.

---
 .../dist/game/data/instances/TrainingZone.xml |  2 +-
 .../instances/TrainingZone/TrainingZone.java  | 36 ++-----------------
 2 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/instances/TrainingZone.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/instances/TrainingZone.xml
index e22f98ad80..74113ec66d 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/instances/TrainingZone.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/instances/TrainingZone.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <instance id="224" maxWorlds="80" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
-	<time duration="60" empty="0" />
+	<time duration="60" empty="5" />
 	<locations>
 		<enter type="FIXED">
 			<location x="-49550" y="17189" z="-3016" />
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/instances/TrainingZone/TrainingZone.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/instances/TrainingZone/TrainingZone.java
index 2effd0547b..b418291d55 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/instances/TrainingZone/TrainingZone.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/instances/TrainingZone/TrainingZone.java
@@ -20,7 +20,6 @@ import java.util.Arrays;
 
 import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData;
 import org.l2jmobius.gameserver.enums.ChatType;
-import org.l2jmobius.gameserver.instancemanager.InstanceManager;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -175,28 +174,7 @@ public class TrainingZone extends AbstractInstance
 				return null;
 			}
 			
-			if (huntingZone.isSoloInstance())
-			{
-				enterInstance(player, npc, huntingZone.getInstanceId());
-			}
-			else
-			{
-				Instance world = null;
-				for (Instance instance : InstanceManager.getInstance().getInstances())
-				{
-					if (instance.getTemplateId() == huntingZone.getInstanceId())
-					{
-						world = instance;
-						break;
-					}
-				}
-				if (world == null)
-				{
-					world = InstanceManager.getInstance().createInstance(huntingZone.getInstanceId(), player);
-				}
-				
-				player.teleToLocation(huntingZone.getEnterLocation(), world);
-			}
+			enterInstance(player, npc, huntingZone.getInstanceId());
 		}
 		switch (event)
 		{
@@ -822,8 +800,8 @@ public class TrainingZone extends AbstractInstance
 	@Override
 	public void onInstanceEnter(Player player, Instance instance)
 	{
-		startEvent(player);
-		player.getInstanceWorld().setDuration(60);
+		instance.setParameter("BATTLEZONE", false);
+		player.sendPacket(new ExSendUIEvent(player, false, false, (int) (instance.getRemainingTime() / 1000), 0, NpcStringId.TIME_LEFT));
 	}
 	
 	@Override
@@ -879,14 +857,6 @@ public class TrainingZone extends AbstractInstance
 		player.sendPacket(new TimedHuntingZoneExit(player.getVariables().getInt(PlayerVariables.LAST_HUNTING_ZONE_ID, 0)));
 		removeBuffs(player);
 		instance.getParameters().remove("TRAINIG_AREA_TELEPORT");
-		instance.finishInstance();
-	}
-	
-	private void startEvent(Player player)
-	{
-		final Instance instance = player.getInstanceWorld();
-		instance.setParameter("BATTLEZONE", false);
-		player.sendPacket(new ExSendUIEvent(player, false, false, Math.min(3600, (int) (instance.getRemainingTime() / 1000)), 0, NpcStringId.TIME_LEFT));
 	}
 	
 	private void removeBuffs(Creature ch)