From fb74736c54b7964946140581d2ee8c066bd4785c Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 9 Oct 2020 02:34:06 +0000
Subject: [PATCH] Prevent auto using bad skills when there is no target.

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

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 d6920a3578..ab0e6a6529 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
@@ -129,6 +129,10 @@ public class AutoUseTaskManager
 							player.getAutoUseSettings().getAutoSkills().remove(skillId);
 							continue BUFFS; // TODO: break?
 						}
+						if ((skill.isBad() && (player.getTarget() == null)) || (player.getTarget() == player))
+						{
+							continue BUFFS;
+						}
 						if (!player.isAffectedBySkill(skillId.intValue()) && !player.hasSkillReuse(skill.getReuseHashCode()) && skill.checkCondition(player, player, false))
 						{
 							// Summon check.
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 d6920a3578..ab0e6a6529 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
@@ -129,6 +129,10 @@ public class AutoUseTaskManager
 							player.getAutoUseSettings().getAutoSkills().remove(skillId);
 							continue BUFFS; // TODO: break?
 						}
+						if ((skill.isBad() && (player.getTarget() == null)) || (player.getTarget() == player))
+						{
+							continue BUFFS;
+						}
 						if (!player.isAffectedBySkill(skillId.intValue()) && !player.hasSkillReuse(skill.getReuseHashCode()) && skill.checkCondition(player, player, false))
 						{
 							// Summon check.