From 00288fa5dcd0b716069fcc9189ddf3b2213df8ce Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 1 Apr 2022 11:39:18 +0000
Subject: [PATCH] Support for multiple or intersecting timed hunting zones.

---
 .../gameserver/model/zone/type/TimedHuntingZone.java          | 4 ++--
 .../gameserver/model/zone/type/TimedHuntingZone.java          | 4 ++--
 .../gameserver/model/zone/type/TimedHuntingZone.java          | 4 ++--
 .../gameserver/model/zone/type/TimedHuntingZone.java          | 4 ++--
 .../gameserver/model/zone/type/TimedHuntingZone.java          | 4 ++--
 .../gameserver/model/zone/type/TimedHuntingZone.java          | 4 ++--
 .../gameserver/model/zone/type/TimedHuntingZone.java          | 4 ++--
 .../gameserver/model/zone/type/TimedHuntingZone.java          | 4 ++--
 .../gameserver/model/zone/type/TimedHuntingZone.java          | 4 ++--
 .../gameserver/model/zone/type/TimedHuntingZone.java          | 4 ++--
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
index 49b78a9dad..55dcf64ab3 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
@@ -40,7 +40,7 @@ public class TimedHuntingZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		if (!creature.isPlayer())
+		if (!creature.isPlayer() || creature.isInsideZone(ZoneId.TIMED_HUNTING))
 		{
 			return;
 		}
@@ -82,7 +82,7 @@ public class TimedHuntingZone extends ZoneType
 		}
 		
 		final Player player = creature.getActingPlayer();
-		if (player != null)
+		if ((player != null) && !player.isInTimedHuntingZone(player.getX(), player.getY()))
 		{
 			player.setInsideZone(ZoneId.TIMED_HUNTING, false);
 			player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
index 49b78a9dad..55dcf64ab3 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
@@ -40,7 +40,7 @@ public class TimedHuntingZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		if (!creature.isPlayer())
+		if (!creature.isPlayer() || creature.isInsideZone(ZoneId.TIMED_HUNTING))
 		{
 			return;
 		}
@@ -82,7 +82,7 @@ public class TimedHuntingZone extends ZoneType
 		}
 		
 		final Player player = creature.getActingPlayer();
-		if (player != null)
+		if ((player != null) && !player.isInTimedHuntingZone(player.getX(), player.getY()))
 		{
 			player.setInsideZone(ZoneId.TIMED_HUNTING, false);
 			player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
index 49b78a9dad..55dcf64ab3 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
@@ -40,7 +40,7 @@ public class TimedHuntingZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		if (!creature.isPlayer())
+		if (!creature.isPlayer() || creature.isInsideZone(ZoneId.TIMED_HUNTING))
 		{
 			return;
 		}
@@ -82,7 +82,7 @@ public class TimedHuntingZone extends ZoneType
 		}
 		
 		final Player player = creature.getActingPlayer();
-		if (player != null)
+		if ((player != null) && !player.isInTimedHuntingZone(player.getX(), player.getY()))
 		{
 			player.setInsideZone(ZoneId.TIMED_HUNTING, false);
 			player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);
diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
index 49b78a9dad..55dcf64ab3 100644
--- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
+++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
@@ -40,7 +40,7 @@ public class TimedHuntingZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		if (!creature.isPlayer())
+		if (!creature.isPlayer() || creature.isInsideZone(ZoneId.TIMED_HUNTING))
 		{
 			return;
 		}
@@ -82,7 +82,7 @@ public class TimedHuntingZone extends ZoneType
 		}
 		
 		final Player player = creature.getActingPlayer();
-		if (player != null)
+		if ((player != null) && !player.isInTimedHuntingZone(player.getX(), player.getY()))
 		{
 			player.setInsideZone(ZoneId.TIMED_HUNTING, false);
 			player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
index 49b78a9dad..55dcf64ab3 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
@@ -40,7 +40,7 @@ public class TimedHuntingZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		if (!creature.isPlayer())
+		if (!creature.isPlayer() || creature.isInsideZone(ZoneId.TIMED_HUNTING))
 		{
 			return;
 		}
@@ -82,7 +82,7 @@ public class TimedHuntingZone extends ZoneType
 		}
 		
 		final Player player = creature.getActingPlayer();
-		if (player != null)
+		if ((player != null) && !player.isInTimedHuntingZone(player.getX(), player.getY()))
 		{
 			player.setInsideZone(ZoneId.TIMED_HUNTING, false);
 			player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
index 49b78a9dad..55dcf64ab3 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
@@ -40,7 +40,7 @@ public class TimedHuntingZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		if (!creature.isPlayer())
+		if (!creature.isPlayer() || creature.isInsideZone(ZoneId.TIMED_HUNTING))
 		{
 			return;
 		}
@@ -82,7 +82,7 @@ public class TimedHuntingZone extends ZoneType
 		}
 		
 		final Player player = creature.getActingPlayer();
-		if (player != null)
+		if ((player != null) && !player.isInTimedHuntingZone(player.getX(), player.getY()))
 		{
 			player.setInsideZone(ZoneId.TIMED_HUNTING, false);
 			player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
index 49b78a9dad..55dcf64ab3 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
@@ -40,7 +40,7 @@ public class TimedHuntingZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		if (!creature.isPlayer())
+		if (!creature.isPlayer() || creature.isInsideZone(ZoneId.TIMED_HUNTING))
 		{
 			return;
 		}
@@ -82,7 +82,7 @@ public class TimedHuntingZone extends ZoneType
 		}
 		
 		final Player player = creature.getActingPlayer();
-		if (player != null)
+		if ((player != null) && !player.isInTimedHuntingZone(player.getX(), player.getY()))
 		{
 			player.setInsideZone(ZoneId.TIMED_HUNTING, false);
 			player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
index 49b78a9dad..55dcf64ab3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
@@ -40,7 +40,7 @@ public class TimedHuntingZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		if (!creature.isPlayer())
+		if (!creature.isPlayer() || creature.isInsideZone(ZoneId.TIMED_HUNTING))
 		{
 			return;
 		}
@@ -82,7 +82,7 @@ public class TimedHuntingZone extends ZoneType
 		}
 		
 		final Player player = creature.getActingPlayer();
-		if (player != null)
+		if ((player != null) && !player.isInTimedHuntingZone(player.getX(), player.getY()))
 		{
 			player.setInsideZone(ZoneId.TIMED_HUNTING, false);
 			player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
index 49b78a9dad..55dcf64ab3 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
@@ -40,7 +40,7 @@ public class TimedHuntingZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		if (!creature.isPlayer())
+		if (!creature.isPlayer() || creature.isInsideZone(ZoneId.TIMED_HUNTING))
 		{
 			return;
 		}
@@ -82,7 +82,7 @@ public class TimedHuntingZone extends ZoneType
 		}
 		
 		final Player player = creature.getActingPlayer();
-		if (player != null)
+		if ((player != null) && !player.isInTimedHuntingZone(player.getX(), player.getY()))
 		{
 			player.setInsideZone(ZoneId.TIMED_HUNTING, false);
 			player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
index 49b78a9dad..55dcf64ab3 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/zone/type/TimedHuntingZone.java
@@ -40,7 +40,7 @@ public class TimedHuntingZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		if (!creature.isPlayer())
+		if (!creature.isPlayer() || creature.isInsideZone(ZoneId.TIMED_HUNTING))
 		{
 			return;
 		}
@@ -82,7 +82,7 @@ public class TimedHuntingZone extends ZoneType
 		}
 		
 		final Player player = creature.getActingPlayer();
-		if (player != null)
+		if ((player != null) && !player.isInTimedHuntingZone(player.getX(), player.getY()))
 		{
 			player.setInsideZone(ZoneId.TIMED_HUNTING, false);
 			player.sendPacket(TimedHuntingZoneExit.STATIC_PACKET);