From 07cdb370604af906d0018e5467d881c5c0a8a260 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 5 May 2021 18:19:06 +0000
Subject: [PATCH] Check if autoplay bad skills target attackables.

---
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java    | 2 +-
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java    | 2 +-
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java    | 2 +-
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java    | 2 +-
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java    | 2 +-
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 84bfba16ef..c1a5a45637 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -163,7 +163,7 @@ public class AutoUseTaskManager
 						// Check bad skill target.
 						if (skill.isBad())
 						{
-							if (target == null)
+							if ((target == null) || !target.isAttackable())
 							{
 								continue SKILLS;
 							}
diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 84bfba16ef..c1a5a45637 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -163,7 +163,7 @@ public class AutoUseTaskManager
 						// Check bad skill target.
 						if (skill.isBad())
 						{
-							if (target == null)
+							if ((target == null) || !target.isAttackable())
 							{
 								continue SKILLS;
 							}
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 84bfba16ef..c1a5a45637 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -163,7 +163,7 @@ public class AutoUseTaskManager
 						// Check bad skill target.
 						if (skill.isBad())
 						{
-							if (target == null)
+							if ((target == null) || !target.isAttackable())
 							{
 								continue SKILLS;
 							}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 84bfba16ef..c1a5a45637 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -163,7 +163,7 @@ public class AutoUseTaskManager
 						// Check bad skill target.
 						if (skill.isBad())
 						{
-							if (target == null)
+							if ((target == null) || !target.isAttackable())
 							{
 								continue SKILLS;
 							}
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 84bfba16ef..c1a5a45637 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -163,7 +163,7 @@ public class AutoUseTaskManager
 						// Check bad skill target.
 						if (skill.isBad())
 						{
-							if (target == null)
+							if ((target == null) || !target.isAttackable())
 							{
 								continue SKILLS;
 							}
diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 84bfba16ef..c1a5a45637 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -163,7 +163,7 @@ public class AutoUseTaskManager
 						// Check bad skill target.
 						if (skill.isBad())
 						{
-							if (target == null)
+							if ((target == null) || !target.isAttackable())
 							{
 								continue SKILLS;
 							}