diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index adc895ab38..2925c71498 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; +import org.l2jmobius.gameserver.network.SystemMessageId; /** * Skill Turning effect implementation. @@ -48,9 +49,10 @@ public class SkillTurningOverTime extends AbstractEffect } final boolean skillSuccess = _staticChance ? Formulas.calcProbability(_chance, effector, effected, skill) : (Rnd.get(100) < _chance); - if (skillSuccess) + if (skillSuccess && effected.isCastingNow()) { - effected.breakCast(); + effected.abortAllSkillCasters(); + effected.sendPacket(SystemMessageId.YOUR_CASTING_HAS_BEEN_INTERRUPTED); } return super.onActionTime(effector, effected, skill, item); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01600-01699.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01600-01699.xml index 7f31707a02..7977bce8d5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01600-01699.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01600-01699.xml @@ -1261,7 +1261,7 @@ 25 - 3 + 1 diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index adc895ab38..2925c71498 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; +import org.l2jmobius.gameserver.network.SystemMessageId; /** * Skill Turning effect implementation. @@ -48,9 +49,10 @@ public class SkillTurningOverTime extends AbstractEffect } final boolean skillSuccess = _staticChance ? Formulas.calcProbability(_chance, effector, effected, skill) : (Rnd.get(100) < _chance); - if (skillSuccess) + if (skillSuccess && effected.isCastingNow()) { - effected.breakCast(); + effected.abortAllSkillCasters(); + effected.sendPacket(SystemMessageId.YOUR_CASTING_HAS_BEEN_INTERRUPTED); } return super.onActionTime(effector, effected, skill, item); diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/skills/01600-01699.xml b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/skills/01600-01699.xml index b379dc1b0e..5cd686ef3d 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/skills/01600-01699.xml +++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/skills/01600-01699.xml @@ -1299,7 +1299,7 @@ 25 - 3 + 1 diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index adc895ab38..2925c71498 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; +import org.l2jmobius.gameserver.network.SystemMessageId; /** * Skill Turning effect implementation. @@ -48,9 +49,10 @@ public class SkillTurningOverTime extends AbstractEffect } final boolean skillSuccess = _staticChance ? Formulas.calcProbability(_chance, effector, effected, skill) : (Rnd.get(100) < _chance); - if (skillSuccess) + if (skillSuccess && effected.isCastingNow()) { - effected.breakCast(); + effected.abortAllSkillCasters(); + effected.sendPacket(SystemMessageId.YOUR_CASTING_HAS_BEEN_INTERRUPTED); } return super.onActionTime(effector, effected, skill, item); diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/skills/01600-01699.xml b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/skills/01600-01699.xml index 258a8318a3..c6458a88ff 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/skills/01600-01699.xml +++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/skills/01600-01699.xml @@ -1379,7 +1379,7 @@ 25 - 3 + 1 diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index adc895ab38..2925c71498 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; +import org.l2jmobius.gameserver.network.SystemMessageId; /** * Skill Turning effect implementation. @@ -48,9 +49,10 @@ public class SkillTurningOverTime extends AbstractEffect } final boolean skillSuccess = _staticChance ? Formulas.calcProbability(_chance, effector, effected, skill) : (Rnd.get(100) < _chance); - if (skillSuccess) + if (skillSuccess && effected.isCastingNow()) { - effected.breakCast(); + effected.abortAllSkillCasters(); + effected.sendPacket(SystemMessageId.YOUR_CASTING_HAS_BEEN_INTERRUPTED); } return super.onActionTime(effector, effected, skill, item); diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/skills/01600-01699.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/skills/01600-01699.xml index 6d4d8b28de..1d4aa09330 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/skills/01600-01699.xml +++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/skills/01600-01699.xml @@ -1399,7 +1399,7 @@ 25 - 3 + 1 diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index adc895ab38..2925c71498 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; +import org.l2jmobius.gameserver.network.SystemMessageId; /** * Skill Turning effect implementation. @@ -48,9 +49,10 @@ public class SkillTurningOverTime extends AbstractEffect } final boolean skillSuccess = _staticChance ? Formulas.calcProbability(_chance, effector, effected, skill) : (Rnd.get(100) < _chance); - if (skillSuccess) + if (skillSuccess && effected.isCastingNow()) { - effected.breakCast(); + effected.abortAllSkillCasters(); + effected.sendPacket(SystemMessageId.YOUR_CASTING_HAS_BEEN_INTERRUPTED); } return super.onActionTime(effector, effected, skill, item); diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/skills/01600-01699.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/skills/01600-01699.xml index b507382457..8140485392 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/skills/01600-01699.xml +++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/skills/01600-01699.xml @@ -1571,7 +1571,7 @@ 10 - 3 + 1 diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index adc895ab38..2925c71498 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; +import org.l2jmobius.gameserver.network.SystemMessageId; /** * Skill Turning effect implementation. @@ -48,9 +49,10 @@ public class SkillTurningOverTime extends AbstractEffect } final boolean skillSuccess = _staticChance ? Formulas.calcProbability(_chance, effector, effected, skill) : (Rnd.get(100) < _chance); - if (skillSuccess) + if (skillSuccess && effected.isCastingNow()) { - effected.breakCast(); + effected.abortAllSkillCasters(); + effected.sendPacket(SystemMessageId.YOUR_CASTING_HAS_BEEN_INTERRUPTED); } return super.onActionTime(effector, effected, skill, item); diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/skills/01600-01699.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/skills/01600-01699.xml index b507382457..8140485392 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/skills/01600-01699.xml +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/skills/01600-01699.xml @@ -1571,7 +1571,7 @@ 10 - 3 + 1 diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index adc895ab38..2925c71498 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; +import org.l2jmobius.gameserver.network.SystemMessageId; /** * Skill Turning effect implementation. @@ -48,9 +49,10 @@ public class SkillTurningOverTime extends AbstractEffect } final boolean skillSuccess = _staticChance ? Formulas.calcProbability(_chance, effector, effected, skill) : (Rnd.get(100) < _chance); - if (skillSuccess) + if (skillSuccess && effected.isCastingNow()) { - effected.breakCast(); + effected.abortAllSkillCasters(); + effected.sendPacket(SystemMessageId.YOUR_CASTING_HAS_BEEN_INTERRUPTED); } return super.onActionTime(effector, effected, skill, item); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01600-01699.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01600-01699.xml index 75758976ae..e62f5c7450 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01600-01699.xml +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01600-01699.xml @@ -1561,7 +1561,7 @@ 10 - 3 + 1 diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index adc895ab38..2925c71498 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; +import org.l2jmobius.gameserver.network.SystemMessageId; /** * Skill Turning effect implementation. @@ -48,9 +49,10 @@ public class SkillTurningOverTime extends AbstractEffect } final boolean skillSuccess = _staticChance ? Formulas.calcProbability(_chance, effector, effected, skill) : (Rnd.get(100) < _chance); - if (skillSuccess) + if (skillSuccess && effected.isCastingNow()) { - effected.breakCast(); + effected.abortAllSkillCasters(); + effected.sendPacket(SystemMessageId.YOUR_CASTING_HAS_BEEN_INTERRUPTED); } return super.onActionTime(effector, effected, skill, item); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/01600-01699.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/01600-01699.xml index 8f579d53e4..6f8de75c99 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/01600-01699.xml +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/01600-01699.xml @@ -1585,7 +1585,7 @@ 65 - 3 + 1 diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index adc895ab38..2925c71498 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; +import org.l2jmobius.gameserver.network.SystemMessageId; /** * Skill Turning effect implementation. @@ -48,9 +49,10 @@ public class SkillTurningOverTime extends AbstractEffect } final boolean skillSuccess = _staticChance ? Formulas.calcProbability(_chance, effector, effected, skill) : (Rnd.get(100) < _chance); - if (skillSuccess) + if (skillSuccess && effected.isCastingNow()) { - effected.breakCast(); + effected.abortAllSkillCasters(); + effected.sendPacket(SystemMessageId.YOUR_CASTING_HAS_BEEN_INTERRUPTED); } return super.onActionTime(effector, effected, skill, item); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/01600-01699.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/01600-01699.xml index c7630ab665..048751e4de 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/01600-01699.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/01600-01699.xml @@ -1561,7 +1561,7 @@ 65 - 3 + 1 diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index adc895ab38..2925c71498 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; +import org.l2jmobius.gameserver.network.SystemMessageId; /** * Skill Turning effect implementation. @@ -48,9 +49,10 @@ public class SkillTurningOverTime extends AbstractEffect } final boolean skillSuccess = _staticChance ? Formulas.calcProbability(_chance, effector, effected, skill) : (Rnd.get(100) < _chance); - if (skillSuccess) + if (skillSuccess && effected.isCastingNow()) { - effected.breakCast(); + effected.abortAllSkillCasters(); + effected.sendPacket(SystemMessageId.YOUR_CASTING_HAS_BEEN_INTERRUPTED); } return super.onActionTime(effector, effected, skill, item); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/01600-01699.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/01600-01699.xml index 00ef6f59ce..23e1662074 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/01600-01699.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/01600-01699.xml @@ -1581,7 +1581,7 @@ 65 - 3 + 1