From 28585f740d8fc766e18bd9aa3b912b56955584ab Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 8 Jul 2021 15:57:11 +0000 Subject: [PATCH] Static skills should not be affected by double time. Contributed by nasseka. --- .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 2 +- .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 2 +- .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 2 +- .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 2 +- .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 2 +- .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 2 +- .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 2 +- .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 2 +- .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 2 +- .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 2 +- .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 2 +- .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 2 +- .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 2 +- .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 2 +- .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 2 +- .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 2 +- .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 2 +- .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 2 +- .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 2 +- .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 2 +- .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 99b1ebcead..926a39bd43 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1194,7 +1194,7 @@ public class Formulas 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 ((skill != null) && calcSkillMastery(caster, skill)) + if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill)) { time *= 2; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 99b1ebcead..926a39bd43 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1194,7 +1194,7 @@ public class Formulas 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 ((skill != null) && calcSkillMastery(caster, skill)) + if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill)) { time *= 2; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 99b1ebcead..926a39bd43 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1194,7 +1194,7 @@ public class Formulas 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 ((skill != null) && calcSkillMastery(caster, skill)) + if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill)) { time *= 2; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 99b1ebcead..926a39bd43 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1194,7 +1194,7 @@ public class Formulas 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 ((skill != null) && calcSkillMastery(caster, skill)) + if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill)) { time *= 2; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 99b1ebcead..926a39bd43 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1194,7 +1194,7 @@ public class Formulas 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 ((skill != null) && calcSkillMastery(caster, skill)) + if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill)) { time *= 2; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 99b1ebcead..926a39bd43 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1194,7 +1194,7 @@ public class Formulas 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 ((skill != null) && calcSkillMastery(caster, skill)) + if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill)) { time *= 2; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 99b1ebcead..926a39bd43 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1194,7 +1194,7 @@ public class Formulas 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 ((skill != null) && calcSkillMastery(caster, skill)) + if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill)) { time *= 2; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 42aec5ba73..ecee0f6a32 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1194,7 +1194,7 @@ public class Formulas 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 ((skill != null) && calcSkillMastery(caster, skill)) + if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill)) { time *= 2; } diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 42aec5ba73..ecee0f6a32 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1194,7 +1194,7 @@ public class Formulas 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 ((skill != null) && calcSkillMastery(caster, skill)) + if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill)) { time *= 2; } diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 42aec5ba73..ecee0f6a32 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1194,7 +1194,7 @@ public class Formulas 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 ((skill != null) && calcSkillMastery(caster, skill)) + if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill)) { time *= 2; } diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 42aec5ba73..ecee0f6a32 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1194,7 +1194,7 @@ public class Formulas 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 ((skill != null) && calcSkillMastery(caster, skill)) + if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill)) { time *= 2; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 3028801def..ece4bd07e0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1194,7 +1194,7 @@ public class Formulas 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 ((skill != null) && calcSkillMastery(caster, skill)) + if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill)) { time *= 2; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 3028801def..ece4bd07e0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1194,7 +1194,7 @@ public class Formulas 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 ((skill != null) && calcSkillMastery(caster, skill)) + if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill)) { time *= 2; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 3028801def..ece4bd07e0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1194,7 +1194,7 @@ public class Formulas 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 ((skill != null) && calcSkillMastery(caster, skill)) + if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill)) { time *= 2; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 6b8ab02ef9..94d9ec975e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1195,7 +1195,7 @@ public class Formulas 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 ((skill != null) && calcSkillMastery(caster, skill)) + if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill)) { time *= 2; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 6b8ab02ef9..94d9ec975e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1195,7 +1195,7 @@ public class Formulas 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 ((skill != null) && calcSkillMastery(caster, skill)) + if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill)) { time *= 2; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 6b8ab02ef9..94d9ec975e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1195,7 +1195,7 @@ public class Formulas 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 ((skill != null) && calcSkillMastery(caster, skill)) + if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill)) { time *= 2; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 3028801def..ece4bd07e0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1194,7 +1194,7 @@ public class Formulas 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 ((skill != null) && calcSkillMastery(caster, skill)) + if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill)) { time *= 2; } diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 6b8ab02ef9..94d9ec975e 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1195,7 +1195,7 @@ public class Formulas 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 ((skill != null) && calcSkillMastery(caster, skill)) + if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill)) { time *= 2; } diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 6b8ab02ef9..94d9ec975e 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1195,7 +1195,7 @@ public class Formulas 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 ((skill != null) && calcSkillMastery(caster, skill)) + if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill)) { time *= 2; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 6b8ab02ef9..94d9ec975e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1195,7 +1195,7 @@ public class Formulas 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 ((skill != null) && calcSkillMastery(caster, skill)) + if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill)) { time *= 2; }