From 561895582e3452dddcddff9e8bb489034556c80e Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 21 Sep 2020 21:10:58 +0000
Subject: [PATCH] Fixed auto hunt stopping after casting certain skills.

---
 .../model/actor/instance/PlayerInstance.java       | 14 ++++++++++++--
 .../model/actor/instance/PlayerInstance.java       | 14 ++++++++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index d74b5ff5ed..aabf90cc5b 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -14199,9 +14199,19 @@ public class PlayerInstance extends Playable
 			}
 			
 			// Skip thinking.
-			if ((getTarget() != null) && getTarget().isMonster() && (((MonsterInstance) getTarget()).getTarget() == this) && !((MonsterInstance) getTarget()).isAlikeDead())
+			final WorldObject target = getTarget();
+			if ((target != null) && target.isMonster())
 			{
-				return;
+				final MonsterInstance monster = (MonsterInstance) target;
+				if ((monster.getTarget() == this) && !monster.isAlikeDead())
+				{
+					// Check if actually attacking.
+					if (hasAI() && getAI().isAutoAttacking() && !isAttackingNow() && !isCastingNow())
+					{
+						doAutoAttack(monster);
+					}
+					return;
+				}
 			}
 			
 			// Pickup.
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index d447cba572..2e10f3123b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -14146,9 +14146,19 @@ public class PlayerInstance extends Playable
 			}
 			
 			// Skip thinking.
-			if ((getTarget() != null) && getTarget().isMonster() && (((MonsterInstance) getTarget()).getTarget() == this) && !((MonsterInstance) getTarget()).isAlikeDead())
+			final WorldObject target = getTarget();
+			if ((target != null) && target.isMonster())
 			{
-				return;
+				final MonsterInstance monster = (MonsterInstance) target;
+				if ((monster.getTarget() == this) && !monster.isAlikeDead())
+				{
+					// Check if actually attacking.
+					if (hasAI() && getAI().isAutoAttacking() && !isAttackingNow() && !isCastingNow())
+					{
+						doAutoAttack(monster);
+					}
+					return;
+				}
 			}
 			
 			// Pickup.