diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java index 7758ffe098..6dd280bb50 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -526,6 +526,12 @@ public class SkillCaster implements Runnable // Launch the magic skill in order to calculate its effects try { + // Mobius: Disabled characters should not be able to finish bad skills. + if (caster.isAttackingDisabled() && skill.isBad()) + { + return; + } + // Check if the toggle skill effects are already in progress on the L2Character if (skill.isToggle() && caster.isAffectedBySkill(skill.getId())) { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java index 7758ffe098..6dd280bb50 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -526,6 +526,12 @@ public class SkillCaster implements Runnable // Launch the magic skill in order to calculate its effects try { + // Mobius: Disabled characters should not be able to finish bad skills. + if (caster.isAttackingDisabled() && skill.isBad()) + { + return; + } + // Check if the toggle skill effects are already in progress on the L2Character if (skill.isToggle() && caster.isAffectedBySkill(skill.getId())) { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java index 7758ffe098..6dd280bb50 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -526,6 +526,12 @@ public class SkillCaster implements Runnable // Launch the magic skill in order to calculate its effects try { + // Mobius: Disabled characters should not be able to finish bad skills. + if (caster.isAttackingDisabled() && skill.isBad()) + { + return; + } + // Check if the toggle skill effects are already in progress on the L2Character if (skill.isToggle() && caster.isAffectedBySkill(skill.getId())) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java index 7758ffe098..6dd280bb50 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -526,6 +526,12 @@ public class SkillCaster implements Runnable // Launch the magic skill in order to calculate its effects try { + // Mobius: Disabled characters should not be able to finish bad skills. + if (caster.isAttackingDisabled() && skill.isBad()) + { + return; + } + // Check if the toggle skill effects are already in progress on the L2Character if (skill.isToggle() && caster.isAffectedBySkill(skill.getId())) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java index cd4d28782c..2e8484657a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -526,6 +526,12 @@ public class SkillCaster implements Runnable // Launch the magic skill in order to calculate its effects try { + // Mobius: Disabled characters should not be able to finish bad skills. + if (caster.isAttackingDisabled() && skill.isBad()) + { + return; + } + // Check if the toggle skill effects are already in progress on the L2Character if (skill.isToggle() && caster.isAffectedBySkill(skill.getId())) { diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java index cd4d28782c..2e8484657a 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -526,6 +526,12 @@ public class SkillCaster implements Runnable // Launch the magic skill in order to calculate its effects try { + // Mobius: Disabled characters should not be able to finish bad skills. + if (caster.isAttackingDisabled() && skill.isBad()) + { + return; + } + // Check if the toggle skill effects are already in progress on the L2Character if (skill.isToggle() && caster.isAffectedBySkill(skill.getId())) {