Static skills should not be affected by double time.
Contributed by nasseka.
This commit is contained in:
@@ -1194,7 +1194,7 @@ public class Formulas
|
|||||||
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
||||||
|
|
||||||
// If the skill is a mastery skill, the effect will last twice the default time.
|
// If the skill is a mastery skill, the effect will last twice the default time.
|
||||||
if ((skill != null) && calcSkillMastery(caster, skill))
|
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
|
||||||
{
|
{
|
||||||
time *= 2;
|
time *= 2;
|
||||||
}
|
}
|
||||||
|
@@ -1194,7 +1194,7 @@ public class Formulas
|
|||||||
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
||||||
|
|
||||||
// If the skill is a mastery skill, the effect will last twice the default time.
|
// If the skill is a mastery skill, the effect will last twice the default time.
|
||||||
if ((skill != null) && calcSkillMastery(caster, skill))
|
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
|
||||||
{
|
{
|
||||||
time *= 2;
|
time *= 2;
|
||||||
}
|
}
|
||||||
|
@@ -1194,7 +1194,7 @@ public class Formulas
|
|||||||
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
||||||
|
|
||||||
// If the skill is a mastery skill, the effect will last twice the default time.
|
// If the skill is a mastery skill, the effect will last twice the default time.
|
||||||
if ((skill != null) && calcSkillMastery(caster, skill))
|
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
|
||||||
{
|
{
|
||||||
time *= 2;
|
time *= 2;
|
||||||
}
|
}
|
||||||
|
@@ -1194,7 +1194,7 @@ public class Formulas
|
|||||||
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
||||||
|
|
||||||
// If the skill is a mastery skill, the effect will last twice the default time.
|
// If the skill is a mastery skill, the effect will last twice the default time.
|
||||||
if ((skill != null) && calcSkillMastery(caster, skill))
|
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
|
||||||
{
|
{
|
||||||
time *= 2;
|
time *= 2;
|
||||||
}
|
}
|
||||||
|
@@ -1194,7 +1194,7 @@ public class Formulas
|
|||||||
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
||||||
|
|
||||||
// If the skill is a mastery skill, the effect will last twice the default time.
|
// If the skill is a mastery skill, the effect will last twice the default time.
|
||||||
if ((skill != null) && calcSkillMastery(caster, skill))
|
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
|
||||||
{
|
{
|
||||||
time *= 2;
|
time *= 2;
|
||||||
}
|
}
|
||||||
|
@@ -1194,7 +1194,7 @@ public class Formulas
|
|||||||
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
||||||
|
|
||||||
// If the skill is a mastery skill, the effect will last twice the default time.
|
// If the skill is a mastery skill, the effect will last twice the default time.
|
||||||
if ((skill != null) && calcSkillMastery(caster, skill))
|
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
|
||||||
{
|
{
|
||||||
time *= 2;
|
time *= 2;
|
||||||
}
|
}
|
||||||
|
@@ -1194,7 +1194,7 @@ public class Formulas
|
|||||||
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
||||||
|
|
||||||
// If the skill is a mastery skill, the effect will last twice the default time.
|
// If the skill is a mastery skill, the effect will last twice the default time.
|
||||||
if ((skill != null) && calcSkillMastery(caster, skill))
|
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
|
||||||
{
|
{
|
||||||
time *= 2;
|
time *= 2;
|
||||||
}
|
}
|
||||||
|
@@ -1194,7 +1194,7 @@ public class Formulas
|
|||||||
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
||||||
|
|
||||||
// If the skill is a mastery skill, the effect will last twice the default time.
|
// If the skill is a mastery skill, the effect will last twice the default time.
|
||||||
if ((skill != null) && calcSkillMastery(caster, skill))
|
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
|
||||||
{
|
{
|
||||||
time *= 2;
|
time *= 2;
|
||||||
}
|
}
|
||||||
|
@@ -1194,7 +1194,7 @@ public class Formulas
|
|||||||
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
||||||
|
|
||||||
// If the skill is a mastery skill, the effect will last twice the default time.
|
// If the skill is a mastery skill, the effect will last twice the default time.
|
||||||
if ((skill != null) && calcSkillMastery(caster, skill))
|
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
|
||||||
{
|
{
|
||||||
time *= 2;
|
time *= 2;
|
||||||
}
|
}
|
||||||
|
@@ -1194,7 +1194,7 @@ public class Formulas
|
|||||||
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
||||||
|
|
||||||
// If the skill is a mastery skill, the effect will last twice the default time.
|
// If the skill is a mastery skill, the effect will last twice the default time.
|
||||||
if ((skill != null) && calcSkillMastery(caster, skill))
|
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
|
||||||
{
|
{
|
||||||
time *= 2;
|
time *= 2;
|
||||||
}
|
}
|
||||||
|
@@ -1194,7 +1194,7 @@ public class Formulas
|
|||||||
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
||||||
|
|
||||||
// If the skill is a mastery skill, the effect will last twice the default time.
|
// If the skill is a mastery skill, the effect will last twice the default time.
|
||||||
if ((skill != null) && calcSkillMastery(caster, skill))
|
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
|
||||||
{
|
{
|
||||||
time *= 2;
|
time *= 2;
|
||||||
}
|
}
|
||||||
|
@@ -1194,7 +1194,7 @@ public class Formulas
|
|||||||
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
||||||
|
|
||||||
// If the skill is a mastery skill, the effect will last twice the default time.
|
// If the skill is a mastery skill, the effect will last twice the default time.
|
||||||
if ((skill != null) && calcSkillMastery(caster, skill))
|
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
|
||||||
{
|
{
|
||||||
time *= 2;
|
time *= 2;
|
||||||
}
|
}
|
||||||
|
@@ -1194,7 +1194,7 @@ public class Formulas
|
|||||||
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
||||||
|
|
||||||
// If the skill is a mastery skill, the effect will last twice the default time.
|
// If the skill is a mastery skill, the effect will last twice the default time.
|
||||||
if ((skill != null) && calcSkillMastery(caster, skill))
|
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
|
||||||
{
|
{
|
||||||
time *= 2;
|
time *= 2;
|
||||||
}
|
}
|
||||||
|
@@ -1194,7 +1194,7 @@ public class Formulas
|
|||||||
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
||||||
|
|
||||||
// If the skill is a mastery skill, the effect will last twice the default time.
|
// If the skill is a mastery skill, the effect will last twice the default time.
|
||||||
if ((skill != null) && calcSkillMastery(caster, skill))
|
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
|
||||||
{
|
{
|
||||||
time *= 2;
|
time *= 2;
|
||||||
}
|
}
|
||||||
|
@@ -1195,7 +1195,7 @@ public class Formulas
|
|||||||
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
||||||
|
|
||||||
// If the skill is a mastery skill, the effect will last twice the default time.
|
// If the skill is a mastery skill, the effect will last twice the default time.
|
||||||
if ((skill != null) && calcSkillMastery(caster, skill))
|
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
|
||||||
{
|
{
|
||||||
time *= 2;
|
time *= 2;
|
||||||
}
|
}
|
||||||
|
@@ -1195,7 +1195,7 @@ public class Formulas
|
|||||||
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
||||||
|
|
||||||
// If the skill is a mastery skill, the effect will last twice the default time.
|
// If the skill is a mastery skill, the effect will last twice the default time.
|
||||||
if ((skill != null) && calcSkillMastery(caster, skill))
|
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
|
||||||
{
|
{
|
||||||
time *= 2;
|
time *= 2;
|
||||||
}
|
}
|
||||||
|
@@ -1195,7 +1195,7 @@ public class Formulas
|
|||||||
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
||||||
|
|
||||||
// If the skill is a mastery skill, the effect will last twice the default time.
|
// If the skill is a mastery skill, the effect will last twice the default time.
|
||||||
if ((skill != null) && calcSkillMastery(caster, skill))
|
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
|
||||||
{
|
{
|
||||||
time *= 2;
|
time *= 2;
|
||||||
}
|
}
|
||||||
|
@@ -1194,7 +1194,7 @@ public class Formulas
|
|||||||
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
||||||
|
|
||||||
// If the skill is a mastery skill, the effect will last twice the default time.
|
// If the skill is a mastery skill, the effect will last twice the default time.
|
||||||
if ((skill != null) && calcSkillMastery(caster, skill))
|
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
|
||||||
{
|
{
|
||||||
time *= 2;
|
time *= 2;
|
||||||
}
|
}
|
||||||
|
@@ -1195,7 +1195,7 @@ public class Formulas
|
|||||||
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
||||||
|
|
||||||
// If the skill is a mastery skill, the effect will last twice the default time.
|
// If the skill is a mastery skill, the effect will last twice the default time.
|
||||||
if ((skill != null) && calcSkillMastery(caster, skill))
|
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
|
||||||
{
|
{
|
||||||
time *= 2;
|
time *= 2;
|
||||||
}
|
}
|
||||||
|
@@ -1195,7 +1195,7 @@ public class Formulas
|
|||||||
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
||||||
|
|
||||||
// If the skill is a mastery skill, the effect will last twice the default time.
|
// If the skill is a mastery skill, the effect will last twice the default time.
|
||||||
if ((skill != null) && calcSkillMastery(caster, skill))
|
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
|
||||||
{
|
{
|
||||||
time *= 2;
|
time *= 2;
|
||||||
}
|
}
|
||||||
|
@@ -1195,7 +1195,7 @@ public class Formulas
|
|||||||
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
|
||||||
|
|
||||||
// If the skill is a mastery skill, the effect will last twice the default time.
|
// If the skill is a mastery skill, the effect will last twice the default time.
|
||||||
if ((skill != null) && calcSkillMastery(caster, skill))
|
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
|
||||||
{
|
{
|
||||||
time *= 2;
|
time *= 2;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user