Replace lower level when a new skill is available.
Contributed by nasseka.
This commit is contained in:
@@ -335,7 +335,7 @@ public class AutoUseTaskManager implements Runnable
|
||||
}
|
||||
|
||||
final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
|
||||
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME);
|
||||
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel());
|
||||
}
|
||||
|
||||
private boolean canUseMagic(Player player, WorldObject target, Skill skill)
|
||||
|
@@ -335,7 +335,7 @@ public class AutoUseTaskManager implements Runnable
|
||||
}
|
||||
|
||||
final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
|
||||
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME);
|
||||
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel());
|
||||
}
|
||||
|
||||
private boolean canUseMagic(Player player, WorldObject target, Skill skill)
|
||||
|
@@ -335,7 +335,7 @@ public class AutoUseTaskManager implements Runnable
|
||||
}
|
||||
|
||||
final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
|
||||
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME);
|
||||
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel());
|
||||
}
|
||||
|
||||
private boolean canUseMagic(Player player, WorldObject target, Skill skill)
|
||||
|
@@ -335,7 +335,7 @@ public class AutoUseTaskManager implements Runnable
|
||||
}
|
||||
|
||||
final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
|
||||
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME);
|
||||
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel());
|
||||
}
|
||||
|
||||
private boolean canUseMagic(Player player, WorldObject target, Skill skill)
|
||||
|
@@ -335,7 +335,7 @@ public class AutoUseTaskManager implements Runnable
|
||||
}
|
||||
|
||||
final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
|
||||
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME);
|
||||
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel());
|
||||
}
|
||||
|
||||
private boolean canUseMagic(Player player, WorldObject target, Skill skill)
|
||||
|
@@ -335,7 +335,7 @@ public class AutoUseTaskManager implements Runnable
|
||||
}
|
||||
|
||||
final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
|
||||
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME);
|
||||
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel());
|
||||
}
|
||||
|
||||
private boolean canUseMagic(Player player, WorldObject target, Skill skill)
|
||||
|
@@ -335,7 +335,7 @@ public class AutoUseTaskManager implements Runnable
|
||||
}
|
||||
|
||||
final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
|
||||
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME);
|
||||
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel());
|
||||
}
|
||||
|
||||
private boolean canUseMagic(Player player, WorldObject target, Skill skill)
|
||||
|
@@ -335,7 +335,7 @@ public class AutoUseTaskManager implements Runnable
|
||||
}
|
||||
|
||||
final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
|
||||
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME);
|
||||
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel());
|
||||
}
|
||||
|
||||
private boolean canUseMagic(Player player, WorldObject target, Skill skill)
|
||||
|
@@ -335,7 +335,7 @@ public class AutoUseTaskManager implements Runnable
|
||||
}
|
||||
|
||||
final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
|
||||
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME);
|
||||
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel());
|
||||
}
|
||||
|
||||
private boolean canUseMagic(Player player, WorldObject target, Skill skill)
|
||||
|
@@ -335,7 +335,7 @@ public class AutoUseTaskManager implements Runnable
|
||||
}
|
||||
|
||||
final BuffInfo buffInfo = playableTarget.getEffectList().getBuffInfoBySkillId(skill.getId());
|
||||
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME);
|
||||
return (buffInfo == null) || (buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel());
|
||||
}
|
||||
|
||||
private boolean canUseMagic(Player player, WorldObject target, Skill skill)
|
||||
|
Reference in New Issue
Block a user