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

AutoUseTaskManager should take in consideration abnormal type.

Browse Source 
Contributed by Index.
This commit is contained in:
MobiusDevelopment
2022-04-08 22:02:08 +00:00
parent 44b198a652
commit aaccf247b5
10 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -379,7 +379,10 @@ public class AutoUseTaskManager implements Runnable
} }
final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId()); final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()); final BuffInfo abnormalBuffInfo = playableTarget.getEffectList().getFirstBuffInfoByAbnormalType(skill.getAbnormalType());
return ((buffInfo == null) && (abnormalBuffInfo == null)) //
|| ((buffInfo != null) && (abnormalBuffInfo.getSkill().getId() == buffInfo.getSkill().getId()) && ((buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()))) //
|| (abnormalBuffInfo.getSkill().getAbnormalLevel() < skill.getAbnormalLevel());
} }
private boolean canUseMagic(Player player, WorldObject target, Skill skill) private boolean canUseMagic(Player player, WorldObject target, Skill skill)

5
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -379,7 +379,10 @@ public class AutoUseTaskManager implements Runnable
} }
final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId()); final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()); final BuffInfo abnormalBuffInfo = playableTarget.getEffectList().getFirstBuffInfoByAbnormalType(skill.getAbnormalType());
return ((buffInfo == null) && (abnormalBuffInfo == null)) //
|| ((buffInfo != null) && (abnormalBuffInfo.getSkill().getId() == buffInfo.getSkill().getId()) && ((buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()))) //
|| (abnormalBuffInfo.getSkill().getAbnormalLevel() < skill.getAbnormalLevel());
} }
private boolean canUseMagic(Player player, WorldObject target, Skill skill) private boolean canUseMagic(Player player, WorldObject target, Skill skill)

5
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -379,7 +379,10 @@ public class AutoUseTaskManager implements Runnable
} }
final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId()); final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()); final BuffInfo abnormalBuffInfo = playableTarget.getEffectList().getFirstBuffInfoByAbnormalType(skill.getAbnormalType());
return ((buffInfo == null) && (abnormalBuffInfo == null)) //
|| ((buffInfo != null) && (abnormalBuffInfo.getSkill().getId() == buffInfo.getSkill().getId()) && ((buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()))) //
|| (abnormalBuffInfo.getSkill().getAbnormalLevel() < skill.getAbnormalLevel());
} }
private boolean canUseMagic(Player player, WorldObject target, Skill skill) private boolean canUseMagic(Player player, WorldObject target, Skill skill)

5
L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -379,7 +379,10 @@ public class AutoUseTaskManager implements Runnable
} }
final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId()); final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()); final BuffInfo abnormalBuffInfo = playableTarget.getEffectList().getFirstBuffInfoByAbnormalType(skill.getAbnormalType());
return ((buffInfo == null) && (abnormalBuffInfo == null)) //
|| ((buffInfo != null) && (abnormalBuffInfo.getSkill().getId() == buffInfo.getSkill().getId()) && ((buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()))) //
|| (abnormalBuffInfo.getSkill().getAbnormalLevel() < skill.getAbnormalLevel());
} }
private boolean canUseMagic(Player player, WorldObject target, Skill skill) private boolean canUseMagic(Player player, WorldObject target, Skill skill)

5
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -379,7 +379,10 @@ public class AutoUseTaskManager implements Runnable
} }
final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId()); final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()); final BuffInfo abnormalBuffInfo = playableTarget.getEffectList().getFirstBuffInfoByAbnormalType(skill.getAbnormalType());
return ((buffInfo == null) && (abnormalBuffInfo == null)) //
|| ((buffInfo != null) && (abnormalBuffInfo.getSkill().getId() == buffInfo.getSkill().getId()) && ((buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()))) //
|| (abnormalBuffInfo.getSkill().getAbnormalLevel() < skill.getAbnormalLevel());
} }
private boolean canUseMagic(Player player, WorldObject target, Skill skill) private boolean canUseMagic(Player player, WorldObject target, Skill skill)

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

@@ -379,7 +379,10 @@ public class AutoUseTaskManager implements Runnable
} }
final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId()); final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()); final BuffInfo abnormalBuffInfo = playableTarget.getEffectList().getFirstBuffInfoByAbnormalType(skill.getAbnormalType());
return ((buffInfo == null) && (abnormalBuffInfo == null)) //
|| ((buffInfo != null) && (abnormalBuffInfo.getSkill().getId() == buffInfo.getSkill().getId()) && ((buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()))) //
|| (abnormalBuffInfo.getSkill().getAbnormalLevel() < skill.getAbnormalLevel());
} }
private boolean canUseMagic(Player player, WorldObject target, Skill skill) private boolean canUseMagic(Player player, WorldObject target, Skill skill)

5
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -379,7 +379,10 @@ public class AutoUseTaskManager implements Runnable
} }
final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId()); final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()); final BuffInfo abnormalBuffInfo = playableTarget.getEffectList().getFirstBuffInfoByAbnormalType(skill.getAbnormalType());
return ((buffInfo == null) && (abnormalBuffInfo == null)) //
|| ((buffInfo != null) && (abnormalBuffInfo.getSkill().getId() == buffInfo.getSkill().getId()) && ((buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()))) //
|| (abnormalBuffInfo.getSkill().getAbnormalLevel() < skill.getAbnormalLevel());
} }
private boolean canUseMagic(Player player, WorldObject target, Skill skill) private boolean canUseMagic(Player player, WorldObject target, Skill skill)

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

@@ -379,7 +379,10 @@ public class AutoUseTaskManager implements Runnable
} }
final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId()); final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()); final BuffInfo abnormalBuffInfo = playableTarget.getEffectList().getFirstBuffInfoByAbnormalType(skill.getAbnormalType());
return ((buffInfo == null) && (abnormalBuffInfo == null)) //
|| ((buffInfo != null) && (abnormalBuffInfo.getSkill().getId() == buffInfo.getSkill().getId()) && ((buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()))) //
|| (abnormalBuffInfo.getSkill().getAbnormalLevel() < skill.getAbnormalLevel());
} }
private boolean canUseMagic(Player player, WorldObject target, Skill skill) private boolean canUseMagic(Player player, WorldObject target, Skill skill)

5
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -379,7 +379,10 @@ public class AutoUseTaskManager implements Runnable
} }
final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId()); final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()); final BuffInfo abnormalBuffInfo = playableTarget.getEffectList().getFirstBuffInfoByAbnormalType(skill.getAbnormalType());
return ((buffInfo == null) && (abnormalBuffInfo == null)) //
|| ((buffInfo != null) && (abnormalBuffInfo.getSkill().getId() == buffInfo.getSkill().getId()) && ((buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()))) //
|| (abnormalBuffInfo.getSkill().getAbnormalLevel() < skill.getAbnormalLevel());
} }
private boolean canUseMagic(Player player, WorldObject target, Skill skill) private boolean canUseMagic(Player player, WorldObject target, Skill skill)

5
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -379,7 +379,10 @@ public class AutoUseTaskManager implements Runnable
} }
final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId()); final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()); final BuffInfo abnormalBuffInfo = playableTarget.getEffectList().getFirstBuffInfoByAbnormalType(skill.getAbnormalType());
return ((buffInfo == null) && (abnormalBuffInfo == null)) //
|| ((buffInfo != null) && (abnormalBuffInfo.getSkill().getId() == buffInfo.getSkill().getId()) && ((buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()))) //
|| (abnormalBuffInfo.getSkill().getAbnormalLevel() < skill.getAbnormalLevel());
} }
private boolean canUseMagic(Player player, WorldObject target, Skill skill) private boolean canUseMagic(Player player, WorldObject target, Skill skill)