From 5a11632d2880ceec1b9ce1724bbd8b8166daaa26 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 5 Jul 2022 10:56:31 +0000 Subject: [PATCH] Damage should not interrupt spellcasting when target has DC_MOD abnormal type. Contributed by Enryu and nasseka. --- .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 6 ++++++ .../java/org/l2jmobius/gameserver/model/stats/Formulas.java | 6 ++++++ 23 files changed, 138 insertions(+) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java index d7a186cdb1..7553b3cd9f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -425,6 +425,12 @@ public class Formulas return false; } + // Cannot interrupt targets affected by Burst or Superior Burst Casting. + if (target.hasAbnormalType(AbnormalType.DC_MOD)) + { + return false; + } + double init = 0; if (Config.ALT_GAME_CANCEL_CAST && target.isCastingNow(SkillCaster::canAbortCast)) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java index d7a186cdb1..7553b3cd9f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -425,6 +425,12 @@ public class Formulas return false; } + // Cannot interrupt targets affected by Burst or Superior Burst Casting. + if (target.hasAbnormalType(AbnormalType.DC_MOD)) + { + return false; + } + double init = 0; if (Config.ALT_GAME_CANCEL_CAST && target.isCastingNow(SkillCaster::canAbortCast)) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java index d7a186cdb1..7553b3cd9f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -425,6 +425,12 @@ public class Formulas return false; } + // Cannot interrupt targets affected by Burst or Superior Burst Casting. + if (target.hasAbnormalType(AbnormalType.DC_MOD)) + { + return false; + } + double init = 0; if (Config.ALT_GAME_CANCEL_CAST && target.isCastingNow(SkillCaster::canAbortCast)) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java index d7a186cdb1..7553b3cd9f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -425,6 +425,12 @@ public class Formulas return false; } + // Cannot interrupt targets affected by Burst or Superior Burst Casting. + if (target.hasAbnormalType(AbnormalType.DC_MOD)) + { + return false; + } + double init = 0; if (Config.ALT_GAME_CANCEL_CAST && target.isCastingNow(SkillCaster::canAbortCast)) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java index d7a186cdb1..7553b3cd9f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -425,6 +425,12 @@ public class Formulas return false; } + // Cannot interrupt targets affected by Burst or Superior Burst Casting. + if (target.hasAbnormalType(AbnormalType.DC_MOD)) + { + return false; + } + double init = 0; if (Config.ALT_GAME_CANCEL_CAST && target.isCastingNow(SkillCaster::canAbortCast)) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java index d7a186cdb1..7553b3cd9f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -425,6 +425,12 @@ public class Formulas return false; } + // Cannot interrupt targets affected by Burst or Superior Burst Casting. + if (target.hasAbnormalType(AbnormalType.DC_MOD)) + { + return false; + } + double init = 0; if (Config.ALT_GAME_CANCEL_CAST && target.isCastingNow(SkillCaster::canAbortCast)) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java index d7a186cdb1..7553b3cd9f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -425,6 +425,12 @@ public class Formulas return false; } + // Cannot interrupt targets affected by Burst or Superior Burst Casting. + if (target.hasAbnormalType(AbnormalType.DC_MOD)) + { + return false; + } + double init = 0; if (Config.ALT_GAME_CANCEL_CAST && target.isCastingNow(SkillCaster::canAbortCast)) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java index be6ab95e6c..dbd7b4fc68 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -425,6 +425,12 @@ public class Formulas return false; } + // Cannot interrupt targets affected by Burst or Superior Burst Casting. + if (target.hasAbnormalType(AbnormalType.DC_MOD)) + { + return false; + } + double init = 0; if (Config.ALT_GAME_CANCEL_CAST && target.isCastingNow(SkillCaster::canAbortCast)) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java index be6ab95e6c..dbd7b4fc68 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -425,6 +425,12 @@ public class Formulas return false; } + // Cannot interrupt targets affected by Burst or Superior Burst Casting. + if (target.hasAbnormalType(AbnormalType.DC_MOD)) + { + return false; + } + double init = 0; if (Config.ALT_GAME_CANCEL_CAST && target.isCastingNow(SkillCaster::canAbortCast)) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java index be6ab95e6c..dbd7b4fc68 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -425,6 +425,12 @@ public class Formulas return false; } + // Cannot interrupt targets affected by Burst or Superior Burst Casting. + if (target.hasAbnormalType(AbnormalType.DC_MOD)) + { + return false; + } + double init = 0; if (Config.ALT_GAME_CANCEL_CAST && target.isCastingNow(SkillCaster::canAbortCast)) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 78809f3922..571c7d630d 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -425,6 +425,12 @@ public class Formulas return false; } + // Cannot interrupt targets affected by Burst or Superior Burst Casting. + if (target.hasAbnormalType(AbnormalType.DC_MOD)) + { + return false; + } + double init = 0; if (Config.ALT_GAME_CANCEL_CAST && target.isCastingNow(SkillCaster::canAbortCast)) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 99dfb86e41..d65d9a7e4a 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -431,6 +431,12 @@ public class Formulas return false; } + // Cannot interrupt targets affected by Burst or Superior Burst Casting. + if (target.hasAbnormalType(AbnormalType.DC_MOD)) + { + return false; + } + double init = 0; if (Config.ALT_GAME_CANCEL_CAST && target.isCastingNow(SkillCaster::canAbortCast)) 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 85ec39f4dc..2aa32d702d 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 @@ -425,6 +425,12 @@ public class Formulas return false; } + // Cannot interrupt targets affected by Burst or Superior Burst Casting. + if (target.hasAbnormalType(AbnormalType.DC_MOD)) + { + return false; + } + double init = 0; if (Config.ALT_GAME_CANCEL_CAST && target.isCastingNow(SkillCaster::canAbortCast)) 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 85ec39f4dc..2aa32d702d 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 @@ -425,6 +425,12 @@ public class Formulas return false; } + // Cannot interrupt targets affected by Burst or Superior Burst Casting. + if (target.hasAbnormalType(AbnormalType.DC_MOD)) + { + return false; + } + double init = 0; if (Config.ALT_GAME_CANCEL_CAST && target.isCastingNow(SkillCaster::canAbortCast)) 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 85ec39f4dc..2aa32d702d 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 @@ -425,6 +425,12 @@ public class Formulas return false; } + // Cannot interrupt targets affected by Burst or Superior Burst Casting. + if (target.hasAbnormalType(AbnormalType.DC_MOD)) + { + return false; + } + double init = 0; if (Config.ALT_GAME_CANCEL_CAST && target.isCastingNow(SkillCaster::canAbortCast)) 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 9049752ecd..6d8e8b23de 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 @@ -426,6 +426,12 @@ public class Formulas return false; } + // Cannot interrupt targets affected by Burst or Superior Burst Casting. + if (target.hasAbnormalType(AbnormalType.DC_MOD)) + { + return false; + } + double init = 0; if (Config.ALT_GAME_CANCEL_CAST && target.isCastingNow(SkillCaster::canAbortCast)) 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 9049752ecd..6d8e8b23de 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 @@ -426,6 +426,12 @@ public class Formulas return false; } + // Cannot interrupt targets affected by Burst or Superior Burst Casting. + if (target.hasAbnormalType(AbnormalType.DC_MOD)) + { + return false; + } + double init = 0; if (Config.ALT_GAME_CANCEL_CAST && target.isCastingNow(SkillCaster::canAbortCast)) 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 9049752ecd..6d8e8b23de 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 @@ -426,6 +426,12 @@ public class Formulas return false; } + // Cannot interrupt targets affected by Burst or Superior Burst Casting. + if (target.hasAbnormalType(AbnormalType.DC_MOD)) + { + return false; + } + double init = 0; if (Config.ALT_GAME_CANCEL_CAST && target.isCastingNow(SkillCaster::canAbortCast)) 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 be6ab95e6c..dbd7b4fc68 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 @@ -425,6 +425,12 @@ public class Formulas return false; } + // Cannot interrupt targets affected by Burst or Superior Burst Casting. + if (target.hasAbnormalType(AbnormalType.DC_MOD)) + { + return false; + } + double init = 0; if (Config.ALT_GAME_CANCEL_CAST && target.isCastingNow(SkillCaster::canAbortCast)) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 9049752ecd..6d8e8b23de 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -426,6 +426,12 @@ public class Formulas return false; } + // Cannot interrupt targets affected by Burst or Superior Burst Casting. + if (target.hasAbnormalType(AbnormalType.DC_MOD)) + { + return false; + } + double init = 0; if (Config.ALT_GAME_CANCEL_CAST && target.isCastingNow(SkillCaster::canAbortCast)) 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 9049752ecd..6d8e8b23de 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 @@ -426,6 +426,12 @@ public class Formulas return false; } + // Cannot interrupt targets affected by Burst or Superior Burst Casting. + if (target.hasAbnormalType(AbnormalType.DC_MOD)) + { + return false; + } + double init = 0; if (Config.ALT_GAME_CANCEL_CAST && target.isCastingNow(SkillCaster::canAbortCast)) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 6349bc469a..17b483479b 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -426,6 +426,12 @@ public class Formulas return false; } + // Cannot interrupt targets affected by Burst or Superior Burst Casting. + if (target.hasAbnormalType(AbnormalType.DC_MOD)) + { + return false; + } + double init = 0; if (Config.ALT_GAME_CANCEL_CAST && target.isCastingNow(SkillCaster::canAbortCast)) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 84974effb8..0392fba03b 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -432,6 +432,12 @@ public class Formulas return false; } + // Cannot interrupt targets affected by Burst or Superior Burst Casting. + if (target.hasAbnormalType(AbnormalType.DC_MOD)) + { + return false; + } + double init = 0; if (Config.ALT_GAME_CANCEL_CAST && target.isCastingNow(SkillCaster::canAbortCast))