lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed skill skip order for AutoUseTaskManager.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-07-20 22:03:48 +00:00
parent 241f9a4a10
commit 81cf10162b
8 changed files with 112 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -152,11 +152,10 @@ public class AutoUseTaskManager
{ {
BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
{ {
final Skill skill = player.getKnownSkill(skillId.intValue()); // Fixes start area issue.
if (skill == null) if (isInPeaceZone)
{ {
player.getAutoUseSettings().getAutoSkills().remove(skillId); break BUFFS;
continue BUFFS;
} }
// Already casting. // Already casting.
@@ -165,14 +164,15 @@ public class AutoUseTaskManager
break BUFFS; break BUFFS;
} }
// Not a buff. final Skill skill = player.getKnownSkill(skillId.intValue());
if (skill.isBad()) if (skill == null)
{ {
player.getAutoUseSettings().getAutoSkills().remove(skillId);
continue BUFFS; continue BUFFS;
} }
// Fixes start area issue. // Not a buff.
if (isInPeaceZone) if (skill.isBad())
{ {
continue BUFFS; continue BUFFS;
} }
@@ -195,6 +195,12 @@ public class AutoUseTaskManager
SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
{ {
// Already casting.
if (player.isCastingNow())
{
break SKILLS;
}
final Skill skill = player.getKnownSkill(skillId.intValue()); final Skill skill = player.getKnownSkill(skillId.intValue());
if (skill == null) if (skill == null)
{ {
@@ -202,12 +208,6 @@ public class AutoUseTaskManager
continue SKILLS; continue SKILLS;
} }
// Already casting.
if (player.isCastingNow())
{
break SKILLS;
}
// Not an offensive skill. // Not an offensive skill.
if (!skill.isBad()) if (!skill.isBad())
{ {

28
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -152,11 +152,10 @@ public class AutoUseTaskManager
{ {
BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
{ {
final Skill skill = player.getKnownSkill(skillId.intValue()); // Fixes start area issue.
if (skill == null) if (isInPeaceZone)
{ {
player.getAutoUseSettings().getAutoSkills().remove(skillId); break BUFFS;
continue BUFFS;
} }
// Already casting. // Already casting.
@@ -165,14 +164,15 @@ public class AutoUseTaskManager
break BUFFS; break BUFFS;
} }
// Not a buff. final Skill skill = player.getKnownSkill(skillId.intValue());
if (skill.isBad()) if (skill == null)
{ {
player.getAutoUseSettings().getAutoSkills().remove(skillId);
continue BUFFS; continue BUFFS;
} }
// Fixes start area issue. // Not a buff.
if (isInPeaceZone) if (skill.isBad())
{ {
continue BUFFS; continue BUFFS;
} }
@@ -195,6 +195,12 @@ public class AutoUseTaskManager
SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
{ {
// Already casting.
if (player.isCastingNow())
{
break SKILLS;
}
final Skill skill = player.getKnownSkill(skillId.intValue()); final Skill skill = player.getKnownSkill(skillId.intValue());
if (skill == null) if (skill == null)
{ {
@@ -202,12 +208,6 @@ public class AutoUseTaskManager
continue SKILLS; continue SKILLS;
} }
// Already casting.
if (player.isCastingNow())
{
break SKILLS;
}
// Not an offensive skill. // Not an offensive skill.
if (!skill.isBad()) if (!skill.isBad())
{ {

28
L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -152,11 +152,10 @@ public class AutoUseTaskManager
{ {
BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
{ {
final Skill skill = player.getKnownSkill(skillId.intValue()); // Fixes start area issue.
if (skill == null) if (isInPeaceZone)
{ {
player.getAutoUseSettings().getAutoSkills().remove(skillId); break BUFFS;
continue BUFFS;
} }
// Already casting. // Already casting.
@@ -165,14 +164,15 @@ public class AutoUseTaskManager
break BUFFS; break BUFFS;
} }
// Not a buff. final Skill skill = player.getKnownSkill(skillId.intValue());
if (skill.isBad()) if (skill == null)
{ {
player.getAutoUseSettings().getAutoSkills().remove(skillId);
continue BUFFS; continue BUFFS;
} }
// Fixes start area issue. // Not a buff.
if (isInPeaceZone) if (skill.isBad())
{ {
continue BUFFS; continue BUFFS;
} }
@@ -195,6 +195,12 @@ public class AutoUseTaskManager
SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
{ {
// Already casting.
if (player.isCastingNow())
{
break SKILLS;
}
final Skill skill = player.getKnownSkill(skillId.intValue()); final Skill skill = player.getKnownSkill(skillId.intValue());
if (skill == null) if (skill == null)
{ {
@@ -202,12 +208,6 @@ public class AutoUseTaskManager
continue SKILLS; continue SKILLS;
} }
// Already casting.
if (player.isCastingNow())
{
break SKILLS;
}
// Not an offensive skill. // Not an offensive skill.
if (!skill.isBad()) if (!skill.isBad())
{ {

28
L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -152,11 +152,10 @@ public class AutoUseTaskManager
{ {
BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
{ {
final Skill skill = player.getKnownSkill(skillId.intValue()); // Fixes start area issue.
if (skill == null) if (isInPeaceZone)
{ {
player.getAutoUseSettings().getAutoSkills().remove(skillId); break BUFFS;
continue BUFFS;
} }
// Already casting. // Already casting.
@@ -165,14 +164,15 @@ public class AutoUseTaskManager
break BUFFS; break BUFFS;
} }
// Not a buff. final Skill skill = player.getKnownSkill(skillId.intValue());
if (skill.isBad()) if (skill == null)
{ {
player.getAutoUseSettings().getAutoSkills().remove(skillId);
continue BUFFS; continue BUFFS;
} }
// Fixes start area issue. // Not a buff.
if (isInPeaceZone) if (skill.isBad())
{ {
continue BUFFS; continue BUFFS;
} }
@@ -195,6 +195,12 @@ public class AutoUseTaskManager
SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
{ {
// Already casting.
if (player.isCastingNow())
{
break SKILLS;
}
final Skill skill = player.getKnownSkill(skillId.intValue()); final Skill skill = player.getKnownSkill(skillId.intValue());
if (skill == null) if (skill == null)
{ {
@@ -202,12 +208,6 @@ public class AutoUseTaskManager
continue SKILLS; continue SKILLS;
} }
// Already casting.
if (player.isCastingNow())
{
break SKILLS;
}
// Not an offensive skill. // Not an offensive skill.
if (!skill.isBad()) if (!skill.isBad())
{ {

28
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -152,11 +152,10 @@ public class AutoUseTaskManager
{ {
BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
{ {
final Skill skill = player.getKnownSkill(skillId.intValue()); // Fixes start area issue.
if (skill == null) if (isInPeaceZone)
{ {
player.getAutoUseSettings().getAutoSkills().remove(skillId); break BUFFS;
continue BUFFS;
} }
// Already casting. // Already casting.
@@ -165,14 +164,15 @@ public class AutoUseTaskManager
break BUFFS; break BUFFS;
} }
// Not a buff. final Skill skill = player.getKnownSkill(skillId.intValue());
if (skill.isBad()) if (skill == null)
{ {
player.getAutoUseSettings().getAutoSkills().remove(skillId);
continue BUFFS; continue BUFFS;
} }
// Fixes start area issue. // Not a buff.
if (isInPeaceZone) if (skill.isBad())
{ {
continue BUFFS; continue BUFFS;
} }
@@ -195,6 +195,12 @@ public class AutoUseTaskManager
SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
{ {
// Already casting.
if (player.isCastingNow())
{
break SKILLS;
}
final Skill skill = player.getKnownSkill(skillId.intValue()); final Skill skill = player.getKnownSkill(skillId.intValue());
if (skill == null) if (skill == null)
{ {
@@ -202,12 +208,6 @@ public class AutoUseTaskManager
continue SKILLS; continue SKILLS;
} }
// Already casting.
if (player.isCastingNow())
{
break SKILLS;
}
// Not an offensive skill. // Not an offensive skill.
if (!skill.isBad()) if (!skill.isBad())
{ {

28
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -152,11 +152,10 @@ public class AutoUseTaskManager
{ {
BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
{ {
final Skill skill = player.getKnownSkill(skillId.intValue()); // Fixes start area issue.
if (skill == null) if (isInPeaceZone)
{ {
player.getAutoUseSettings().getAutoSkills().remove(skillId); break BUFFS;
continue BUFFS;
} }
// Already casting. // Already casting.
@@ -165,14 +164,15 @@ public class AutoUseTaskManager
break BUFFS; break BUFFS;
} }
// Not a buff. final Skill skill = player.getKnownSkill(skillId.intValue());
if (skill.isBad()) if (skill == null)
{ {
player.getAutoUseSettings().getAutoSkills().remove(skillId);
continue BUFFS; continue BUFFS;
} }
// Fixes start area issue. // Not a buff.
if (isInPeaceZone) if (skill.isBad())
{ {
continue BUFFS; continue BUFFS;
} }
@@ -195,6 +195,12 @@ public class AutoUseTaskManager
SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
{ {
// Already casting.
if (player.isCastingNow())
{
break SKILLS;
}
final Skill skill = player.getKnownSkill(skillId.intValue()); final Skill skill = player.getKnownSkill(skillId.intValue());
if (skill == null) if (skill == null)
{ {
@@ -202,12 +208,6 @@ public class AutoUseTaskManager
continue SKILLS; continue SKILLS;
} }
// Already casting.
if (player.isCastingNow())
{
break SKILLS;
}
// Not an offensive skill. // Not an offensive skill.
if (!skill.isBad()) if (!skill.isBad())
{ {

28
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -152,11 +152,10 @@ public class AutoUseTaskManager
{ {
BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
{ {
final Skill skill = player.getKnownSkill(skillId.intValue()); // Fixes start area issue.
if (skill == null) if (isInPeaceZone)
{ {
player.getAutoUseSettings().getAutoSkills().remove(skillId); break BUFFS;
continue BUFFS;
} }
// Already casting. // Already casting.
@@ -165,14 +164,15 @@ public class AutoUseTaskManager
break BUFFS; break BUFFS;
} }
// Not a buff. final Skill skill = player.getKnownSkill(skillId.intValue());
if (skill.isBad()) if (skill == null)
{ {
player.getAutoUseSettings().getAutoSkills().remove(skillId);
continue BUFFS; continue BUFFS;
} }
// Fixes start area issue. // Not a buff.
if (isInPeaceZone) if (skill.isBad())
{ {
continue BUFFS; continue BUFFS;
} }
@@ -195,6 +195,12 @@ public class AutoUseTaskManager
SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
{ {
// Already casting.
if (player.isCastingNow())
{
break SKILLS;
}
final Skill skill = player.getKnownSkill(skillId.intValue()); final Skill skill = player.getKnownSkill(skillId.intValue());
if (skill == null) if (skill == null)
{ {
@@ -202,12 +208,6 @@ public class AutoUseTaskManager
continue SKILLS; continue SKILLS;
} }
// Already casting.
if (player.isCastingNow())
{
break SKILLS;
}
// Not an offensive skill. // Not an offensive skill.
if (!skill.isBad()) if (!skill.isBad())
{ {

28
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -152,11 +152,10 @@ public class AutoUseTaskManager
{ {
BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
{ {
final Skill skill = player.getKnownSkill(skillId.intValue()); // Fixes start area issue.
if (skill == null) if (isInPeaceZone)
{ {
player.getAutoUseSettings().getAutoSkills().remove(skillId); break BUFFS;
continue BUFFS;
} }
// Already casting. // Already casting.
@@ -165,14 +164,15 @@ public class AutoUseTaskManager
break BUFFS; break BUFFS;
} }
// Not a buff. final Skill skill = player.getKnownSkill(skillId.intValue());
if (skill.isBad()) if (skill == null)
{ {
player.getAutoUseSettings().getAutoSkills().remove(skillId);
continue BUFFS; continue BUFFS;
} }
// Fixes start area issue. // Not a buff.
if (isInPeaceZone) if (skill.isBad())
{ {
continue BUFFS; continue BUFFS;
} }
@@ -195,6 +195,12 @@ public class AutoUseTaskManager
SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills()) SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
{ {
// Already casting.
if (player.isCastingNow())
{
break SKILLS;
}
final Skill skill = player.getKnownSkill(skillId.intValue()); final Skill skill = player.getKnownSkill(skillId.intValue());
if (skill == null) if (skill == null)
{ {
@@ -202,12 +208,6 @@ public class AutoUseTaskManager
continue SKILLS; continue SKILLS;
} }
// Already casting.
if (player.isCastingNow())
{
break SKILLS;
}
// Not an offensive skill. // Not an offensive skill.
if (!skill.isBad()) if (!skill.isBad())
{ {