diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 71e93a5b99..2bd9c1b811 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index b824c11e38..9d7f95751b 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 9992d60594..a3da7e63ca 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 10985f9947..611ad91f4e 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 71e93a5b99..2bd9c1b811 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index b824c11e38..9d7f95751b 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 9992d60594..a3da7e63ca 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 10985f9947..611ad91f4e 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 71e93a5b99..2bd9c1b811 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index b824c11e38..9d7f95751b 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 9992d60594..a3da7e63ca 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 10985f9947..611ad91f4e 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 71e93a5b99..2bd9c1b811 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index b824c11e38..9d7f95751b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 9992d60594..a3da7e63ca 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 10985f9947..611ad91f4e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 71e93a5b99..2bd9c1b811 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index b824c11e38..9d7f95751b 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 9992d60594..a3da7e63ca 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 10985f9947..611ad91f4e 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 71e93a5b99..2bd9c1b811 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index b824c11e38..9d7f95751b 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 9992d60594..a3da7e63ca 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 10985f9947..611ad91f4e 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 71e93a5b99..2bd9c1b811 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index b824c11e38..9d7f95751b 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 9992d60594..a3da7e63ca 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 10985f9947..611ad91f4e 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 71e93a5b99..2bd9c1b811 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index b824c11e38..9d7f95751b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 9992d60594..a3da7e63ca 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 10985f9947..611ad91f4e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 71e93a5b99..2bd9c1b811 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index b824c11e38..9d7f95751b 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 9992d60594..a3da7e63ca 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 10985f9947..611ad91f4e 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 71e93a5b99..2bd9c1b811 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index b824c11e38..9d7f95751b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 9992d60594..a3da7e63ca 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 10985f9947..611ad91f4e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 71e93a5b99..2bd9c1b811 100644 --- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index b824c11e38..9d7f95751b 100644 --- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 9992d60594..a3da7e63ca 100644 --- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 10985f9947..611ad91f4e 100644 --- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 49980ad240..65a3c48332 100644 --- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index ffb0dc5b63..5d4ec44641 100644 --- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 3c99129e9e..47f6c2401e 100644 --- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 46ad46ea76..10caa2dbc8 100644 --- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 49980ad240..65a3c48332 100644 --- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index ffb0dc5b63..5d4ec44641 100644 --- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 3c99129e9e..47f6c2401e 100644 --- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 46ad46ea76..10caa2dbc8 100644 --- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_11.3_Shinemaker/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_11.3_Shinemaker/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 49980ad240..65a3c48332 100644 --- a/L2J_Mobius_11.3_Shinemaker/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_11.3_Shinemaker/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_11.3_Shinemaker/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_11.3_Shinemaker/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index ffb0dc5b63..5d4ec44641 100644 --- a/L2J_Mobius_11.3_Shinemaker/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_11.3_Shinemaker/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_11.3_Shinemaker/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_11.3_Shinemaker/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 3c99129e9e..47f6c2401e 100644 --- a/L2J_Mobius_11.3_Shinemaker/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_11.3_Shinemaker/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_11.3_Shinemaker/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_11.3_Shinemaker/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 46ad46ea76..10caa2dbc8 100644 --- a/L2J_Mobius_11.3_Shinemaker/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_11.3_Shinemaker/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 49980ad240..65a3c48332 100644 --- a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index ffb0dc5b63..5d4ec44641 100644 --- a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 3c99129e9e..47f6c2401e 100644 --- a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 46ad46ea76..10caa2dbc8 100644 --- a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index ad831e0056..8e1a593700 100644 --- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -62,7 +62,7 @@ public class DispelByCategory extends AbstractEffect @Override public void onStart(Creature effector, Creature effected, Skill skill) { - if (effected.isDead()) + if (effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index 31d3ffd50c..853a499870 100644 --- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -76,7 +76,7 @@ public class DispelBySlot extends AbstractEffect @Override public void onStart(Creature effector, Creature effected, Skill skill) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index dc8d7cb163..c2deebc3fe 100644 --- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -79,7 +79,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void onStart(Creature effector, Creature effected, Skill skill) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index b3e1911e46..fe61132a4c 100644 --- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -54,6 +54,11 @@ public class TargetCancel extends AbstractEffect @Override public void onStart(Creature effector, Creature effected, Skill skill) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index ad831e0056..8e1a593700 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -62,7 +62,7 @@ public class DispelByCategory extends AbstractEffect @Override public void onStart(Creature effector, Creature effected, Skill skill) { - if (effected.isDead()) + if (effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index d5e5ccd89b..cae0a95025 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -76,7 +76,7 @@ public class DispelBySlot extends AbstractEffect @Override public void onStart(Creature effector, Creature effected, Skill skill) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 1c590a40f2..457c674e2f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -79,7 +79,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void onStart(Creature effector, Creature effected, Skill skill) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index b3e1911e46..fe61132a4c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -54,6 +54,11 @@ public class TargetCancel extends AbstractEffect @Override public void onStart(Creature effector, Creature effected, Skill skill) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index d0c6230c56..e505a31c65 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -62,7 +62,7 @@ public class DispelByCategory extends AbstractEffect @Override public void onStart(Creature effector, Creature effected, Skill skill) { - if (effected.isDead()) + if (effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index d5e5ccd89b..cae0a95025 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -76,7 +76,7 @@ public class DispelBySlot extends AbstractEffect @Override public void onStart(Creature effector, Creature effected, Skill skill) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 1c590a40f2..457c674e2f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -79,7 +79,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void onStart(Creature effector, Creature effected, Skill skill) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index b3e1911e46..fe61132a4c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -54,6 +54,11 @@ public class TargetCancel extends AbstractEffect @Override public void onStart(Creature effector, Creature effected, Skill skill) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 71e93a5b99..2bd9c1b811 100644 --- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index b824c11e38..9d7f95751b 100644 --- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 9992d60594..a3da7e63ca 100644 --- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 10985f9947..611ad91f4e 100644 --- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 71e93a5b99..2bd9c1b811 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index b824c11e38..9d7f95751b 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 9992d60594..a3da7e63ca 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 10985f9947..611ad91f4e 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 71e93a5b99..2bd9c1b811 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index b824c11e38..9d7f95751b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 9992d60594..a3da7e63ca 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 10985f9947..611ad91f4e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 71e93a5b99..2bd9c1b811 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index b824c11e38..9d7f95751b 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 9992d60594..a3da7e63ca 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 10985f9947..611ad91f4e 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 71e93a5b99..2bd9c1b811 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index b824c11e38..9d7f95751b 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 9992d60594..a3da7e63ca 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 10985f9947..611ad91f4e 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 71e93a5b99..2bd9c1b811 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index b824c11e38..9d7f95751b 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 9992d60594..a3da7e63ca 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 10985f9947..611ad91f4e 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 71e93a5b99..2bd9c1b811 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index b824c11e38..9d7f95751b 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 9992d60594..a3da7e63ca 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 10985f9947..611ad91f4e 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 71e93a5b99..2bd9c1b811 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index b824c11e38..9d7f95751b 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 9992d60594..a3da7e63ca 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 10985f9947..611ad91f4e 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 71e93a5b99..2bd9c1b811 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index b824c11e38..9d7f95751b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 9992d60594..a3da7e63ca 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 10985f9947..611ad91f4e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 71e93a5b99..2bd9c1b811 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index b824c11e38..9d7f95751b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 9992d60594..a3da7e63ca 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 10985f9947..611ad91f4e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 71e93a5b99..2bd9c1b811 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index b824c11e38..9d7f95751b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 9992d60594..a3da7e63ca 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 10985f9947..611ad91f4e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 71e93a5b99..2bd9c1b811 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index b824c11e38..9d7f95751b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 9992d60594..a3da7e63ca 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 10985f9947..611ad91f4e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 71e93a5b99..2bd9c1b811 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index b824c11e38..9d7f95751b 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 9992d60594..a3da7e63ca 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 10985f9947..611ad91f4e 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 49980ad240..65a3c48332 100644 --- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index ffb0dc5b63..5d4ec44641 100644 --- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 3c99129e9e..47f6c2401e 100644 --- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 46ad46ea76..10caa2dbc8 100644 --- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 49980ad240..65a3c48332 100644 --- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index ffb0dc5b63..5d4ec44641 100644 --- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 3c99129e9e..47f6c2401e 100644 --- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 46ad46ea76..10caa2dbc8 100644 --- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_Essence_7.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Essence_7.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 49980ad240..65a3c48332 100644 --- a/L2J_Mobius_Essence_7.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Essence_7.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Essence_7.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Essence_7.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index ffb0dc5b63..5d4ec44641 100644 --- a/L2J_Mobius_Essence_7.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Essence_7.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Essence_7.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Essence_7.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 3c99129e9e..47f6c2401e 100644 --- a/L2J_Mobius_Essence_7.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Essence_7.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Essence_7.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Essence_7.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 46ad46ea76..10caa2dbc8 100644 --- a/L2J_Mobius_Essence_7.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Essence_7.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast(); diff --git a/L2J_Mobius_Essence_8.1_HighElves/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Essence_8.1_HighElves/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 49980ad240..65a3c48332 100644 --- a/L2J_Mobius_Essence_8.1_HighElves/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Essence_8.1_HighElves/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -61,7 +61,7 @@ public class DispelByCategory extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if ((skill == null) || effected.isDead()) + if ((skill == null) || effected.isDead() || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Essence_8.1_HighElves/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Essence_8.1_HighElves/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index ffb0dc5b63..5d4ec44641 100644 --- a/L2J_Mobius_Essence_8.1_HighElves/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Essence_8.1_HighElves/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -70,7 +70,7 @@ public class DispelBySlot extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (_dispelAbnormals.isEmpty()) + if (_dispelAbnormals.isEmpty() || (effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Essence_8.1_HighElves/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Essence_8.1_HighElves/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 3c99129e9e..47f6c2401e 100644 --- a/L2J_Mobius_Essence_8.1_HighElves/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Essence_8.1_HighElves/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -63,7 +63,7 @@ public class DispelBySlotProbability extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { - if (effected == null) + if ((effected == null) || effected.isRaid()) { return; } diff --git a/L2J_Mobius_Essence_8.1_HighElves/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Essence_8.1_HighElves/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 46ad46ea76..10caa2dbc8 100644 --- a/L2J_Mobius_Essence_8.1_HighElves/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Essence_8.1_HighElves/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -53,6 +53,11 @@ public class TargetCancel extends AbstractEffect @Override public void instant(Creature effector, Creature effected, Skill skill, Item item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.setTarget(null); effected.abortAttack(); effected.abortCast();