From 82d959ac4f08f4059a4a006f0327ecd34c6b8e6c Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 17 Aug 2022 21:21:14 +0000 Subject: [PATCH] Prohibit auto casting SUMMON TargetType when all summons are affected. Contributed by Index. --- .../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 +- .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 2 +- .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 2 +- .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 2 +- .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index 1e26ac1507..4858b5d735 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -361,7 +361,7 @@ public class AutoUseTaskManager implements Runnable private boolean canCastBuff(Player player, WorldObject target, Skill skill) { // Summon check. - if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) + if ((skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) || (skill.getTargetType() == TargetType.SUMMON)) { if (!player.hasServitors()) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index 1e26ac1507..4858b5d735 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -361,7 +361,7 @@ public class AutoUseTaskManager implements Runnable private boolean canCastBuff(Player player, WorldObject target, Skill skill) { // Summon check. - if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) + if ((skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) || (skill.getTargetType() == TargetType.SUMMON)) { if (!player.hasServitors()) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index 1e26ac1507..4858b5d735 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -361,7 +361,7 @@ public class AutoUseTaskManager implements Runnable private boolean canCastBuff(Player player, WorldObject target, Skill skill) { // Summon check. - if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) + if ((skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) || (skill.getTargetType() == TargetType.SUMMON)) { if (!player.hasServitors()) { diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index 1e26ac1507..4858b5d735 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -361,7 +361,7 @@ public class AutoUseTaskManager implements Runnable private boolean canCastBuff(Player player, WorldObject target, Skill skill) { // Summon check. - if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) + if ((skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) || (skill.getTargetType() == TargetType.SUMMON)) { if (!player.hasServitors()) { diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index 1e26ac1507..4858b5d735 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -361,7 +361,7 @@ public class AutoUseTaskManager implements Runnable private boolean canCastBuff(Player player, WorldObject target, Skill skill) { // Summon check. - if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) + if ((skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) || (skill.getTargetType() == TargetType.SUMMON)) { if (!player.hasServitors()) { 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 1e26ac1507..4858b5d735 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 @@ -361,7 +361,7 @@ public class AutoUseTaskManager implements Runnable private boolean canCastBuff(Player player, WorldObject target, Skill skill) { // Summon check. - if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) + if ((skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) || (skill.getTargetType() == TargetType.SUMMON)) { if (!player.hasServitors()) { 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 635c08d849..f48a64a6db 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 @@ -390,7 +390,7 @@ public class AutoUseTaskManager implements Runnable private boolean canCastBuff(Player player, WorldObject target, Skill skill) { // Summon check. - if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) + if ((skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) || (skill.getTargetType() == TargetType.SUMMON)) { if (!player.hasServitors()) { 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 635c08d849..f48a64a6db 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 @@ -390,7 +390,7 @@ public class AutoUseTaskManager implements Runnable private boolean canCastBuff(Player player, WorldObject target, Skill skill) { // Summon check. - if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) + if ((skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) || (skill.getTargetType() == TargetType.SUMMON)) { if (!player.hasServitors()) { diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index 635c08d849..f48a64a6db 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -390,7 +390,7 @@ public class AutoUseTaskManager implements Runnable private boolean canCastBuff(Player player, WorldObject target, Skill skill) { // Summon check. - if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) + if ((skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) || (skill.getTargetType() == TargetType.SUMMON)) { if (!player.hasServitors()) { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index 635c08d849..f48a64a6db 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -390,7 +390,7 @@ public class AutoUseTaskManager implements Runnable private boolean canCastBuff(Player player, WorldObject target, Skill skill) { // Summon check. - if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) + if ((skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) || (skill.getTargetType() == TargetType.SUMMON)) { if (!player.hasServitors()) {