From 19fa9a724e050af906db843aa01528cd98404705 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 12 Oct 2021 21:14:22 +0000 Subject: [PATCH] Prevent auto targeting dead creatures. --- .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 3 ++- .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 3 ++- .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 3 ++- .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 3 ++- .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 3 ++- .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 3 ++- 6 files changed, 12 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 91ed956955..e40b10f40a 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 @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.handler.PlayerActionHandler; import org.l2jmobius.gameserver.model.ActionDataHolder; import org.l2jmobius.gameserver.model.WorldObject; +import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.GuardInstance; @@ -246,7 +247,7 @@ public class AutoUseTaskManager implements Runnable } // Check bad skill target. - if ((target == null) || !target.isAttackable()) + if ((target == null) || !target.isAttackable() || ((Creature) target).isDead()) { break SKILLS; } diff --git a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index 91ed956955..e40b10f40a 100644 --- a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.handler.PlayerActionHandler; import org.l2jmobius.gameserver.model.ActionDataHolder; import org.l2jmobius.gameserver.model.WorldObject; +import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.GuardInstance; @@ -246,7 +247,7 @@ public class AutoUseTaskManager implements Runnable } // Check bad skill target. - if ((target == null) || !target.isAttackable()) + if ((target == null) || !target.isAttackable() || ((Creature) target).isDead()) { break SKILLS; } diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index 91ed956955..e40b10f40a 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.handler.PlayerActionHandler; import org.l2jmobius.gameserver.model.ActionDataHolder; import org.l2jmobius.gameserver.model.WorldObject; +import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.GuardInstance; @@ -246,7 +247,7 @@ public class AutoUseTaskManager implements Runnable } // Check bad skill target. - if ((target == null) || !target.isAttackable()) + if ((target == null) || !target.isAttackable() || ((Creature) target).isDead()) { break 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 91ed956955..e40b10f40a 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 @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.handler.PlayerActionHandler; import org.l2jmobius.gameserver.model.ActionDataHolder; import org.l2jmobius.gameserver.model.WorldObject; +import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.GuardInstance; @@ -246,7 +247,7 @@ public class AutoUseTaskManager implements Runnable } // Check bad skill target. - if ((target == null) || !target.isAttackable()) + if ((target == null) || !target.isAttackable() || ((Creature) target).isDead()) { break SKILLS; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index 91ed956955..e40b10f40a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.handler.PlayerActionHandler; import org.l2jmobius.gameserver.model.ActionDataHolder; import org.l2jmobius.gameserver.model.WorldObject; +import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.GuardInstance; @@ -246,7 +247,7 @@ public class AutoUseTaskManager implements Runnable } // Check bad skill target. - if ((target == null) || !target.isAttackable()) + if ((target == null) || !target.isAttackable() || ((Creature) target).isDead()) { break SKILLS; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index 91ed956955..e40b10f40a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.handler.PlayerActionHandler; import org.l2jmobius.gameserver.model.ActionDataHolder; import org.l2jmobius.gameserver.model.WorldObject; +import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.GuardInstance; @@ -246,7 +247,7 @@ public class AutoUseTaskManager implements Runnable } // Check bad skill target. - if ((target == null) || !target.isAttackable()) + if ((target == null) || !target.isAttackable() || ((Creature) target).isDead()) { break SKILLS; }