From 81cf10162bca18ff12e72ae828f92e46a78d2c77 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 20 Jul 2021 22:03:48 +0000 Subject: [PATCH] Changed skill skip order for AutoUseTaskManager. --- .../taskmanager/AutoUseTaskManager.java | 28 +++++++++---------- .../taskmanager/AutoUseTaskManager.java | 28 +++++++++---------- .../taskmanager/AutoUseTaskManager.java | 28 +++++++++---------- .../taskmanager/AutoUseTaskManager.java | 28 +++++++++---------- .../taskmanager/AutoUseTaskManager.java | 28 +++++++++---------- .../taskmanager/AutoUseTaskManager.java | 28 +++++++++---------- .../taskmanager/AutoUseTaskManager.java | 28 +++++++++---------- .../taskmanager/AutoUseTaskManager.java | 28 +++++++++---------- 8 files changed, 112 insertions(+), 112 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 f32d6f9d09..07f3f58c23 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 @@ -152,11 +152,10 @@ public class AutoUseTaskManager { BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) { - final Skill skill = player.getKnownSkill(skillId.intValue()); - if (skill == null) + // Fixes start area issue. + if (isInPeaceZone) { - player.getAutoUseSettings().getAutoSkills().remove(skillId); - continue BUFFS; + break BUFFS; } // Already casting. @@ -165,14 +164,15 @@ public class AutoUseTaskManager break BUFFS; } - // Not a buff. - if (skill.isBad()) + final Skill skill = player.getKnownSkill(skillId.intValue()); + if (skill == null) { + player.getAutoUseSettings().getAutoSkills().remove(skillId); continue BUFFS; } - // Fixes start area issue. - if (isInPeaceZone) + // Not a buff. + if (skill.isBad()) { continue BUFFS; } @@ -195,6 +195,12 @@ public class AutoUseTaskManager SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) { + // Already casting. + if (player.isCastingNow()) + { + break SKILLS; + } + final Skill skill = player.getKnownSkill(skillId.intValue()); if (skill == null) { @@ -202,12 +208,6 @@ public class AutoUseTaskManager continue SKILLS; } - // Already casting. - if (player.isCastingNow()) - { - break SKILLS; - } - // Not an offensive skill. if (!skill.isBad()) { 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 f32d6f9d09..07f3f58c23 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 @@ -152,11 +152,10 @@ public class AutoUseTaskManager { BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) { - final Skill skill = player.getKnownSkill(skillId.intValue()); - if (skill == null) + // Fixes start area issue. + if (isInPeaceZone) { - player.getAutoUseSettings().getAutoSkills().remove(skillId); - continue BUFFS; + break BUFFS; } // Already casting. @@ -165,14 +164,15 @@ public class AutoUseTaskManager break BUFFS; } - // Not a buff. - if (skill.isBad()) + final Skill skill = player.getKnownSkill(skillId.intValue()); + if (skill == null) { + player.getAutoUseSettings().getAutoSkills().remove(skillId); continue BUFFS; } - // Fixes start area issue. - if (isInPeaceZone) + // Not a buff. + if (skill.isBad()) { continue BUFFS; } @@ -195,6 +195,12 @@ public class AutoUseTaskManager SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) { + // Already casting. + if (player.isCastingNow()) + { + break SKILLS; + } + final Skill skill = player.getKnownSkill(skillId.intValue()); if (skill == null) { @@ -202,12 +208,6 @@ public class AutoUseTaskManager continue SKILLS; } - // Already casting. - if (player.isCastingNow()) - { - break SKILLS; - } - // Not an offensive skill. if (!skill.isBad()) { 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 f32d6f9d09..07f3f58c23 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 @@ -152,11 +152,10 @@ public class AutoUseTaskManager { BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) { - final Skill skill = player.getKnownSkill(skillId.intValue()); - if (skill == null) + // Fixes start area issue. + if (isInPeaceZone) { - player.getAutoUseSettings().getAutoSkills().remove(skillId); - continue BUFFS; + break BUFFS; } // Already casting. @@ -165,14 +164,15 @@ public class AutoUseTaskManager break BUFFS; } - // Not a buff. - if (skill.isBad()) + final Skill skill = player.getKnownSkill(skillId.intValue()); + if (skill == null) { + player.getAutoUseSettings().getAutoSkills().remove(skillId); continue BUFFS; } - // Fixes start area issue. - if (isInPeaceZone) + // Not a buff. + if (skill.isBad()) { continue BUFFS; } @@ -195,6 +195,12 @@ public class AutoUseTaskManager SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) { + // Already casting. + if (player.isCastingNow()) + { + break SKILLS; + } + final Skill skill = player.getKnownSkill(skillId.intValue()); if (skill == null) { @@ -202,12 +208,6 @@ public class AutoUseTaskManager continue SKILLS; } - // Already casting. - if (player.isCastingNow()) - { - break SKILLS; - } - // Not an offensive skill. if (!skill.isBad()) { diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index f32d6f9d09..07f3f58c23 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -152,11 +152,10 @@ public class AutoUseTaskManager { BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) { - final Skill skill = player.getKnownSkill(skillId.intValue()); - if (skill == null) + // Fixes start area issue. + if (isInPeaceZone) { - player.getAutoUseSettings().getAutoSkills().remove(skillId); - continue BUFFS; + break BUFFS; } // Already casting. @@ -165,14 +164,15 @@ public class AutoUseTaskManager break BUFFS; } - // Not a buff. - if (skill.isBad()) + final Skill skill = player.getKnownSkill(skillId.intValue()); + if (skill == null) { + player.getAutoUseSettings().getAutoSkills().remove(skillId); continue BUFFS; } - // Fixes start area issue. - if (isInPeaceZone) + // Not a buff. + if (skill.isBad()) { continue BUFFS; } @@ -195,6 +195,12 @@ public class AutoUseTaskManager SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) { + // Already casting. + if (player.isCastingNow()) + { + break SKILLS; + } + final Skill skill = player.getKnownSkill(skillId.intValue()); if (skill == null) { @@ -202,12 +208,6 @@ public class AutoUseTaskManager continue SKILLS; } - // Already casting. - if (player.isCastingNow()) - { - break SKILLS; - } - // Not an offensive skill. if (!skill.isBad()) { 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 f32d6f9d09..07f3f58c23 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 @@ -152,11 +152,10 @@ public class AutoUseTaskManager { BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) { - final Skill skill = player.getKnownSkill(skillId.intValue()); - if (skill == null) + // Fixes start area issue. + if (isInPeaceZone) { - player.getAutoUseSettings().getAutoSkills().remove(skillId); - continue BUFFS; + break BUFFS; } // Already casting. @@ -165,14 +164,15 @@ public class AutoUseTaskManager break BUFFS; } - // Not a buff. - if (skill.isBad()) + final Skill skill = player.getKnownSkill(skillId.intValue()); + if (skill == null) { + player.getAutoUseSettings().getAutoSkills().remove(skillId); continue BUFFS; } - // Fixes start area issue. - if (isInPeaceZone) + // Not a buff. + if (skill.isBad()) { continue BUFFS; } @@ -195,6 +195,12 @@ public class AutoUseTaskManager SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) { + // Already casting. + if (player.isCastingNow()) + { + break SKILLS; + } + final Skill skill = player.getKnownSkill(skillId.intValue()); if (skill == null) { @@ -202,12 +208,6 @@ public class AutoUseTaskManager continue SKILLS; } - // Already casting. - if (player.isCastingNow()) - { - break SKILLS; - } - // Not an offensive skill. if (!skill.isBad()) { 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 f32d6f9d09..07f3f58c23 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 @@ -152,11 +152,10 @@ public class AutoUseTaskManager { BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) { - final Skill skill = player.getKnownSkill(skillId.intValue()); - if (skill == null) + // Fixes start area issue. + if (isInPeaceZone) { - player.getAutoUseSettings().getAutoSkills().remove(skillId); - continue BUFFS; + break BUFFS; } // Already casting. @@ -165,14 +164,15 @@ public class AutoUseTaskManager break BUFFS; } - // Not a buff. - if (skill.isBad()) + final Skill skill = player.getKnownSkill(skillId.intValue()); + if (skill == null) { + player.getAutoUseSettings().getAutoSkills().remove(skillId); continue BUFFS; } - // Fixes start area issue. - if (isInPeaceZone) + // Not a buff. + if (skill.isBad()) { continue BUFFS; } @@ -195,6 +195,12 @@ public class AutoUseTaskManager SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) { + // Already casting. + if (player.isCastingNow()) + { + break SKILLS; + } + final Skill skill = player.getKnownSkill(skillId.intValue()); if (skill == null) { @@ -202,12 +208,6 @@ public class AutoUseTaskManager continue SKILLS; } - // Already casting. - if (player.isCastingNow()) - { - break SKILLS; - } - // Not an offensive skill. if (!skill.isBad()) { 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 f32d6f9d09..07f3f58c23 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 @@ -152,11 +152,10 @@ public class AutoUseTaskManager { BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) { - final Skill skill = player.getKnownSkill(skillId.intValue()); - if (skill == null) + // Fixes start area issue. + if (isInPeaceZone) { - player.getAutoUseSettings().getAutoSkills().remove(skillId); - continue BUFFS; + break BUFFS; } // Already casting. @@ -165,14 +164,15 @@ public class AutoUseTaskManager break BUFFS; } - // Not a buff. - if (skill.isBad()) + final Skill skill = player.getKnownSkill(skillId.intValue()); + if (skill == null) { + player.getAutoUseSettings().getAutoSkills().remove(skillId); continue BUFFS; } - // Fixes start area issue. - if (isInPeaceZone) + // Not a buff. + if (skill.isBad()) { continue BUFFS; } @@ -195,6 +195,12 @@ public class AutoUseTaskManager SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) { + // Already casting. + if (player.isCastingNow()) + { + break SKILLS; + } + final Skill skill = player.getKnownSkill(skillId.intValue()); if (skill == null) { @@ -202,12 +208,6 @@ public class AutoUseTaskManager continue SKILLS; } - // Already casting. - if (player.isCastingNow()) - { - break SKILLS; - } - // Not an offensive skill. if (!skill.isBad()) { 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 f32d6f9d09..07f3f58c23 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 @@ -152,11 +152,10 @@ public class AutoUseTaskManager { BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) { - final Skill skill = player.getKnownSkill(skillId.intValue()); - if (skill == null) + // Fixes start area issue. + if (isInPeaceZone) { - player.getAutoUseSettings().getAutoSkills().remove(skillId); - continue BUFFS; + break BUFFS; } // Already casting. @@ -165,14 +164,15 @@ public class AutoUseTaskManager break BUFFS; } - // Not a buff. - if (skill.isBad()) + final Skill skill = player.getKnownSkill(skillId.intValue()); + if (skill == null) { + player.getAutoUseSettings().getAutoSkills().remove(skillId); continue BUFFS; } - // Fixes start area issue. - if (isInPeaceZone) + // Not a buff. + if (skill.isBad()) { continue BUFFS; } @@ -195,6 +195,12 @@ public class AutoUseTaskManager SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) { + // Already casting. + if (player.isCastingNow()) + { + break SKILLS; + } + final Skill skill = player.getKnownSkill(skillId.intValue()); if (skill == null) { @@ -202,12 +208,6 @@ public class AutoUseTaskManager continue SKILLS; } - // Already casting. - if (player.isCastingNow()) - { - break SKILLS; - } - // Not an offensive skill. if (!skill.isBad()) {