From 8c71d83be13f2a1b664c4855b96c16760cbb0c5f Mon Sep 17 00:00:00 2001 From: MobiusDevelopment Date: Sat, 7 Dec 2024 20:43:39 +0200 Subject: [PATCH] Exclude invulnerable NPCs from auto play targeting. --- .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ .../gameserver/taskmanager/AutoPlayTaskManager.java | 5 +++++ 33 files changed, 165 insertions(+) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 3929b7f1a0..52d2983f41 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -317,6 +317,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 3929b7f1a0..52d2983f41 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -317,6 +317,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 3929b7f1a0..52d2983f41 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -317,6 +317,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 3929b7f1a0..52d2983f41 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -317,6 +317,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 3929b7f1a0..52d2983f41 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -317,6 +317,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 3929b7f1a0..52d2983f41 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -317,6 +317,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 3929b7f1a0..52d2983f41 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -317,6 +317,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 9f9f3f08f7..b0e4a63b09 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -296,6 +296,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 9f9f3f08f7..b0e4a63b09 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -296,6 +296,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 9f9f3f08f7..b0e4a63b09 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -296,6 +296,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 9f9f3f08f7..b0e4a63b09 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -296,6 +296,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 50c9e6e169..a73fd8e01d 100644 --- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -296,6 +296,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_11.2_AgeOfMagic/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_11.2_AgeOfMagic/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 50c9e6e169..a73fd8e01d 100644 --- a/L2J_Mobius_11.2_AgeOfMagic/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_11.2_AgeOfMagic/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -296,6 +296,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_11.3_Shinemaker/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_11.3_Shinemaker/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 50c9e6e169..a73fd8e01d 100644 --- a/L2J_Mobius_11.3_Shinemaker/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_11.3_Shinemaker/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -296,6 +296,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 95e55c64c7..79461cc9f3 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -312,6 +312,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index e862ad01e5..96a5637a3b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -312,6 +312,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index e862ad01e5..96a5637a3b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -312,6 +312,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 3929b7f1a0..52d2983f41 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -317,6 +317,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 3929b7f1a0..52d2983f41 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -317,6 +317,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 3929b7f1a0..52d2983f41 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -317,6 +317,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 3929b7f1a0..52d2983f41 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -317,6 +317,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 3929b7f1a0..52d2983f41 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -317,6 +317,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 3929b7f1a0..52d2983f41 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -317,6 +317,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 7cff2ad6be..60ab372100 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -318,6 +318,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 3929b7f1a0..52d2983f41 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -317,6 +317,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 7cff2ad6be..60ab372100 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -318,6 +318,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 3929b7f1a0..52d2983f41 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -317,6 +317,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index b2e1c811ca..c4e60915a6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -336,6 +336,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 18ec140dcb..480442ce2e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -336,6 +336,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 18ec140dcb..480442ce2e 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -336,6 +336,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 945b047371..94691187cc 100644 --- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -336,6 +336,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Essence_7.2_AztacansTemple/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 945b047371..94691187cc 100644 --- a/L2J_Mobius_Essence_7.2_AztacansTemple/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_Essence_7.2_AztacansTemple/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -336,6 +336,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster diff --git a/L2J_Mobius_Essence_7.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Essence_7.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 945b047371..94691187cc 100644 --- a/L2J_Mobius_Essence_7.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_Essence_7.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -336,6 +336,11 @@ public class AutoPlayTaskManager private boolean isTargetModeValid(int mode, Player player, Creature creature) { + if (!creature.isTargetable() || (creature.isNpc() && creature.isInvul())) + { + return false; + } + switch (mode) { case 1: // Monster