diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index f56ca977e6..af2ca0c13c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -60,6 +60,11 @@ public final class BlockActions extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + _allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill); effected.startParalyze(); // Cancel running skill casters. diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 0b7b8711a3..65f31caebb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -54,10 +54,14 @@ public final class Fear extends AbstractEffect @Override public boolean canStart(L2Character effector, L2Character effected, Skill skill) { - final L2Character creature = effected; - return creature.isPlayer() || creature.isSummon() || (creature.isAttackable() && // - !((creature instanceof L2DefenderInstance) || (creature instanceof L2FortCommanderInstance) || // - (creature instanceof L2SiegeFlagInstance) || (creature.getTemplate().getRace() == Race.SIEGE_WEAPON))); + if ((effected == null) || effected.isRaid()) + { + return false; + } + + return effected.isPlayer() || effected.isSummon() || (effected.isAttackable() // + && !((effected instanceof L2DefenderInstance) || (effected instanceof L2FortCommanderInstance) // + || (effected instanceof L2SiegeFlagInstance) || (effected.getTemplate().getRace() == Race.SIEGE_WEAPON))); } @Override diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index d36783972e..83ce7b2b1a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -150,6 +150,11 @@ public final class KnockBack extends AbstractEffect private void knockBack(L2Character effector, L2Character effected) { + if ((effected == null) || effected.isRaid()) + { + return; + } + final double radians = Math.toRadians(Util.calculateAngleFrom(effector, effected)); final int x = (int) (effected.getX() + (_distance * Math.cos(radians))); final int y = (int) (effected.getY() + (_distance * Math.sin(radians))); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62bb12ab47..e0d2460c47 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -49,6 +49,11 @@ public final class Mute extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.abortCast(); effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d81d8db8fe..6a20f5d0a0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -61,6 +61,12 @@ public final class PullBack extends AbstractEffect @Override public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + // Prevent pulling raids. + if ((effected == null) || effected.isRaid()) + { + return; + } + // Prevent pulling NPCs. if (!effected.isPlayable() && !effected.isMonster()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Root.java index e73d6ab674..f83b0e4b65 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -59,6 +59,11 @@ public final class Root extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.stopMove(null); effected.getAI().notifyEvent(CtrlEvent.EVT_ROOTED); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index f56ca977e6..af2ca0c13c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -60,6 +60,11 @@ public final class BlockActions extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + _allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill); effected.startParalyze(); // Cancel running skill casters. diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 0b7b8711a3..65f31caebb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -54,10 +54,14 @@ public final class Fear extends AbstractEffect @Override public boolean canStart(L2Character effector, L2Character effected, Skill skill) { - final L2Character creature = effected; - return creature.isPlayer() || creature.isSummon() || (creature.isAttackable() && // - !((creature instanceof L2DefenderInstance) || (creature instanceof L2FortCommanderInstance) || // - (creature instanceof L2SiegeFlagInstance) || (creature.getTemplate().getRace() == Race.SIEGE_WEAPON))); + if ((effected == null) || effected.isRaid()) + { + return false; + } + + return effected.isPlayer() || effected.isSummon() || (effected.isAttackable() // + && !((effected instanceof L2DefenderInstance) || (effected instanceof L2FortCommanderInstance) // + || (effected instanceof L2SiegeFlagInstance) || (effected.getTemplate().getRace() == Race.SIEGE_WEAPON))); } @Override diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index d36783972e..83ce7b2b1a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -150,6 +150,11 @@ public final class KnockBack extends AbstractEffect private void knockBack(L2Character effector, L2Character effected) { + if ((effected == null) || effected.isRaid()) + { + return; + } + final double radians = Math.toRadians(Util.calculateAngleFrom(effector, effected)); final int x = (int) (effected.getX() + (_distance * Math.cos(radians))); final int y = (int) (effected.getY() + (_distance * Math.sin(radians))); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62bb12ab47..e0d2460c47 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -49,6 +49,11 @@ public final class Mute extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.abortCast(); effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d81d8db8fe..6a20f5d0a0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -61,6 +61,12 @@ public final class PullBack extends AbstractEffect @Override public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + // Prevent pulling raids. + if ((effected == null) || effected.isRaid()) + { + return; + } + // Prevent pulling NPCs. if (!effected.isPlayable() && !effected.isMonster()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Root.java index e73d6ab674..f83b0e4b65 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -59,6 +59,11 @@ public final class Root extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.stopMove(null); effected.getAI().notifyEvent(CtrlEvent.EVT_ROOTED); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index f56ca977e6..af2ca0c13c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -60,6 +60,11 @@ public final class BlockActions extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + _allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill); effected.startParalyze(); // Cancel running skill casters. diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 0b7b8711a3..65f31caebb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -54,10 +54,14 @@ public final class Fear extends AbstractEffect @Override public boolean canStart(L2Character effector, L2Character effected, Skill skill) { - final L2Character creature = effected; - return creature.isPlayer() || creature.isSummon() || (creature.isAttackable() && // - !((creature instanceof L2DefenderInstance) || (creature instanceof L2FortCommanderInstance) || // - (creature instanceof L2SiegeFlagInstance) || (creature.getTemplate().getRace() == Race.SIEGE_WEAPON))); + if ((effected == null) || effected.isRaid()) + { + return false; + } + + return effected.isPlayer() || effected.isSummon() || (effected.isAttackable() // + && !((effected instanceof L2DefenderInstance) || (effected instanceof L2FortCommanderInstance) // + || (effected instanceof L2SiegeFlagInstance) || (effected.getTemplate().getRace() == Race.SIEGE_WEAPON))); } @Override diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index d36783972e..83ce7b2b1a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -150,6 +150,11 @@ public final class KnockBack extends AbstractEffect private void knockBack(L2Character effector, L2Character effected) { + if ((effected == null) || effected.isRaid()) + { + return; + } + final double radians = Math.toRadians(Util.calculateAngleFrom(effector, effected)); final int x = (int) (effected.getX() + (_distance * Math.cos(radians))); final int y = (int) (effected.getY() + (_distance * Math.sin(radians))); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62bb12ab47..e0d2460c47 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -49,6 +49,11 @@ public final class Mute extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.abortCast(); effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d81d8db8fe..6a20f5d0a0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -61,6 +61,12 @@ public final class PullBack extends AbstractEffect @Override public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + // Prevent pulling raids. + if ((effected == null) || effected.isRaid()) + { + return; + } + // Prevent pulling NPCs. if (!effected.isPlayable() && !effected.isMonster()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Root.java index e73d6ab674..f83b0e4b65 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -59,6 +59,11 @@ public final class Root extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.stopMove(null); effected.getAI().notifyEvent(CtrlEvent.EVT_ROOTED); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index f56ca977e6..af2ca0c13c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -60,6 +60,11 @@ public final class BlockActions extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + _allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill); effected.startParalyze(); // Cancel running skill casters. diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 0b7b8711a3..65f31caebb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -54,10 +54,14 @@ public final class Fear extends AbstractEffect @Override public boolean canStart(L2Character effector, L2Character effected, Skill skill) { - final L2Character creature = effected; - return creature.isPlayer() || creature.isSummon() || (creature.isAttackable() && // - !((creature instanceof L2DefenderInstance) || (creature instanceof L2FortCommanderInstance) || // - (creature instanceof L2SiegeFlagInstance) || (creature.getTemplate().getRace() == Race.SIEGE_WEAPON))); + if ((effected == null) || effected.isRaid()) + { + return false; + } + + return effected.isPlayer() || effected.isSummon() || (effected.isAttackable() // + && !((effected instanceof L2DefenderInstance) || (effected instanceof L2FortCommanderInstance) // + || (effected instanceof L2SiegeFlagInstance) || (effected.getTemplate().getRace() == Race.SIEGE_WEAPON))); } @Override diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index d36783972e..83ce7b2b1a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -150,6 +150,11 @@ public final class KnockBack extends AbstractEffect private void knockBack(L2Character effector, L2Character effected) { + if ((effected == null) || effected.isRaid()) + { + return; + } + final double radians = Math.toRadians(Util.calculateAngleFrom(effector, effected)); final int x = (int) (effected.getX() + (_distance * Math.cos(radians))); final int y = (int) (effected.getY() + (_distance * Math.sin(radians))); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62bb12ab47..e0d2460c47 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -49,6 +49,11 @@ public final class Mute extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.abortCast(); effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d81d8db8fe..6a20f5d0a0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -61,6 +61,12 @@ public final class PullBack extends AbstractEffect @Override public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + // Prevent pulling raids. + if ((effected == null) || effected.isRaid()) + { + return; + } + // Prevent pulling NPCs. if (!effected.isPlayable() && !effected.isMonster()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Root.java index e73d6ab674..f83b0e4b65 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -59,6 +59,11 @@ public final class Root extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.stopMove(null); effected.getAI().notifyEvent(CtrlEvent.EVT_ROOTED); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index f56ca977e6..af2ca0c13c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -60,6 +60,11 @@ public final class BlockActions extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + _allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill); effected.startParalyze(); // Cancel running skill casters. diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 0b7b8711a3..65f31caebb 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -54,10 +54,14 @@ public final class Fear extends AbstractEffect @Override public boolean canStart(L2Character effector, L2Character effected, Skill skill) { - final L2Character creature = effected; - return creature.isPlayer() || creature.isSummon() || (creature.isAttackable() && // - !((creature instanceof L2DefenderInstance) || (creature instanceof L2FortCommanderInstance) || // - (creature instanceof L2SiegeFlagInstance) || (creature.getTemplate().getRace() == Race.SIEGE_WEAPON))); + if ((effected == null) || effected.isRaid()) + { + return false; + } + + return effected.isPlayer() || effected.isSummon() || (effected.isAttackable() // + && !((effected instanceof L2DefenderInstance) || (effected instanceof L2FortCommanderInstance) // + || (effected instanceof L2SiegeFlagInstance) || (effected.getTemplate().getRace() == Race.SIEGE_WEAPON))); } @Override diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index d36783972e..83ce7b2b1a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -150,6 +150,11 @@ public final class KnockBack extends AbstractEffect private void knockBack(L2Character effector, L2Character effected) { + if ((effected == null) || effected.isRaid()) + { + return; + } + final double radians = Math.toRadians(Util.calculateAngleFrom(effector, effected)); final int x = (int) (effected.getX() + (_distance * Math.cos(radians))); final int y = (int) (effected.getY() + (_distance * Math.sin(radians))); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62bb12ab47..e0d2460c47 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -49,6 +49,11 @@ public final class Mute extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.abortCast(); effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d81d8db8fe..6a20f5d0a0 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -61,6 +61,12 @@ public final class PullBack extends AbstractEffect @Override public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + // Prevent pulling raids. + if ((effected == null) || effected.isRaid()) + { + return; + } + // Prevent pulling NPCs. if (!effected.isPlayable() && !effected.isMonster()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Root.java index e73d6ab674..f83b0e4b65 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -59,6 +59,11 @@ public final class Root extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.stopMove(null); effected.getAI().notifyEvent(CtrlEvent.EVT_ROOTED); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index f56ca977e6..af2ca0c13c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -60,6 +60,11 @@ public final class BlockActions extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + _allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill); effected.startParalyze(); // Cancel running skill casters. diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 0b7b8711a3..65f31caebb 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -54,10 +54,14 @@ public final class Fear extends AbstractEffect @Override public boolean canStart(L2Character effector, L2Character effected, Skill skill) { - final L2Character creature = effected; - return creature.isPlayer() || creature.isSummon() || (creature.isAttackable() && // - !((creature instanceof L2DefenderInstance) || (creature instanceof L2FortCommanderInstance) || // - (creature instanceof L2SiegeFlagInstance) || (creature.getTemplate().getRace() == Race.SIEGE_WEAPON))); + if ((effected == null) || effected.isRaid()) + { + return false; + } + + return effected.isPlayer() || effected.isSummon() || (effected.isAttackable() // + && !((effected instanceof L2DefenderInstance) || (effected instanceof L2FortCommanderInstance) // + || (effected instanceof L2SiegeFlagInstance) || (effected.getTemplate().getRace() == Race.SIEGE_WEAPON))); } @Override diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index d36783972e..83ce7b2b1a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -150,6 +150,11 @@ public final class KnockBack extends AbstractEffect private void knockBack(L2Character effector, L2Character effected) { + if ((effected == null) || effected.isRaid()) + { + return; + } + final double radians = Math.toRadians(Util.calculateAngleFrom(effector, effected)); final int x = (int) (effected.getX() + (_distance * Math.cos(radians))); final int y = (int) (effected.getY() + (_distance * Math.sin(radians))); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62bb12ab47..e0d2460c47 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -49,6 +49,11 @@ public final class Mute extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.abortCast(); effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d81d8db8fe..6a20f5d0a0 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -61,6 +61,12 @@ public final class PullBack extends AbstractEffect @Override public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + // Prevent pulling raids. + if ((effected == null) || effected.isRaid()) + { + return; + } + // Prevent pulling NPCs. if (!effected.isPlayable() && !effected.isMonster()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Root.java index e73d6ab674..f83b0e4b65 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -59,6 +59,11 @@ public final class Root extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.stopMove(null); effected.getAI().notifyEvent(CtrlEvent.EVT_ROOTED); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index f56ca977e6..af2ca0c13c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -60,6 +60,11 @@ public final class BlockActions extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + _allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill); effected.startParalyze(); // Cancel running skill casters. diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 0b7b8711a3..65f31caebb 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -54,10 +54,14 @@ public final class Fear extends AbstractEffect @Override public boolean canStart(L2Character effector, L2Character effected, Skill skill) { - final L2Character creature = effected; - return creature.isPlayer() || creature.isSummon() || (creature.isAttackable() && // - !((creature instanceof L2DefenderInstance) || (creature instanceof L2FortCommanderInstance) || // - (creature instanceof L2SiegeFlagInstance) || (creature.getTemplate().getRace() == Race.SIEGE_WEAPON))); + if ((effected == null) || effected.isRaid()) + { + return false; + } + + return effected.isPlayer() || effected.isSummon() || (effected.isAttackable() // + && !((effected instanceof L2DefenderInstance) || (effected instanceof L2FortCommanderInstance) // + || (effected instanceof L2SiegeFlagInstance) || (effected.getTemplate().getRace() == Race.SIEGE_WEAPON))); } @Override diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index d36783972e..83ce7b2b1a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -150,6 +150,11 @@ public final class KnockBack extends AbstractEffect private void knockBack(L2Character effector, L2Character effected) { + if ((effected == null) || effected.isRaid()) + { + return; + } + final double radians = Math.toRadians(Util.calculateAngleFrom(effector, effected)); final int x = (int) (effected.getX() + (_distance * Math.cos(radians))); final int y = (int) (effected.getY() + (_distance * Math.sin(radians))); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62bb12ab47..e0d2460c47 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -49,6 +49,11 @@ public final class Mute extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.abortCast(); effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d81d8db8fe..6a20f5d0a0 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -61,6 +61,12 @@ public final class PullBack extends AbstractEffect @Override public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + // Prevent pulling raids. + if ((effected == null) || effected.isRaid()) + { + return; + } + // Prevent pulling NPCs. if (!effected.isPlayable() && !effected.isMonster()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Root.java index e73d6ab674..f83b0e4b65 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -59,6 +59,11 @@ public final class Root extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.stopMove(null); effected.getAI().notifyEvent(CtrlEvent.EVT_ROOTED); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index f56ca977e6..af2ca0c13c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -60,6 +60,11 @@ public final class BlockActions extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + _allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill); effected.startParalyze(); // Cancel running skill casters. diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 0b7b8711a3..65f31caebb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -54,10 +54,14 @@ public final class Fear extends AbstractEffect @Override public boolean canStart(L2Character effector, L2Character effected, Skill skill) { - final L2Character creature = effected; - return creature.isPlayer() || creature.isSummon() || (creature.isAttackable() && // - !((creature instanceof L2DefenderInstance) || (creature instanceof L2FortCommanderInstance) || // - (creature instanceof L2SiegeFlagInstance) || (creature.getTemplate().getRace() == Race.SIEGE_WEAPON))); + if ((effected == null) || effected.isRaid()) + { + return false; + } + + return effected.isPlayer() || effected.isSummon() || (effected.isAttackable() // + && !((effected instanceof L2DefenderInstance) || (effected instanceof L2FortCommanderInstance) // + || (effected instanceof L2SiegeFlagInstance) || (effected.getTemplate().getRace() == Race.SIEGE_WEAPON))); } @Override diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 3b4d69cf20..9ac65e4f77 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -102,6 +102,11 @@ public final class KnockBack extends AbstractEffect private void knockBack(L2Character effector, L2Character effected) { + if ((effected == null) || effected.isRaid()) + { + return; + } + final double radians = Math.toRadians(Util.calculateAngleFrom(effector, effected)); final int x = (int) (effected.getX() + (_distance * Math.cos(radians))); final int y = (int) (effected.getY() + (_distance * Math.sin(radians))); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62bb12ab47..e0d2460c47 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -49,6 +49,11 @@ public final class Mute extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.abortCast(); effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d81d8db8fe..6a20f5d0a0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -61,6 +61,12 @@ public final class PullBack extends AbstractEffect @Override public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + // Prevent pulling raids. + if ((effected == null) || effected.isRaid()) + { + return; + } + // Prevent pulling NPCs. if (!effected.isPlayable() && !effected.isMonster()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Root.java index e73d6ab674..f83b0e4b65 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -59,6 +59,11 @@ public final class Root extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.stopMove(null); effected.getAI().notifyEvent(CtrlEvent.EVT_ROOTED); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index f56ca977e6..af2ca0c13c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -60,6 +60,11 @@ public final class BlockActions extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + _allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill); effected.startParalyze(); // Cancel running skill casters. diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 0b7b8711a3..65f31caebb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -54,10 +54,14 @@ public final class Fear extends AbstractEffect @Override public boolean canStart(L2Character effector, L2Character effected, Skill skill) { - final L2Character creature = effected; - return creature.isPlayer() || creature.isSummon() || (creature.isAttackable() && // - !((creature instanceof L2DefenderInstance) || (creature instanceof L2FortCommanderInstance) || // - (creature instanceof L2SiegeFlagInstance) || (creature.getTemplate().getRace() == Race.SIEGE_WEAPON))); + if ((effected == null) || effected.isRaid()) + { + return false; + } + + return effected.isPlayer() || effected.isSummon() || (effected.isAttackable() // + && !((effected instanceof L2DefenderInstance) || (effected instanceof L2FortCommanderInstance) // + || (effected instanceof L2SiegeFlagInstance) || (effected.getTemplate().getRace() == Race.SIEGE_WEAPON))); } @Override diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 3b4d69cf20..9ac65e4f77 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -102,6 +102,11 @@ public final class KnockBack extends AbstractEffect private void knockBack(L2Character effector, L2Character effected) { + if ((effected == null) || effected.isRaid()) + { + return; + } + final double radians = Math.toRadians(Util.calculateAngleFrom(effector, effected)); final int x = (int) (effected.getX() + (_distance * Math.cos(radians))); final int y = (int) (effected.getY() + (_distance * Math.sin(radians))); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62bb12ab47..e0d2460c47 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -49,6 +49,11 @@ public final class Mute extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.abortCast(); effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d81d8db8fe..6a20f5d0a0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -61,6 +61,12 @@ public final class PullBack extends AbstractEffect @Override public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + // Prevent pulling raids. + if ((effected == null) || effected.isRaid()) + { + return; + } + // Prevent pulling NPCs. if (!effected.isPlayable() && !effected.isMonster()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Root.java index e73d6ab674..f83b0e4b65 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -59,6 +59,11 @@ public final class Root extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.stopMove(null); effected.getAI().notifyEvent(CtrlEvent.EVT_ROOTED); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index f56ca977e6..af2ca0c13c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -60,6 +60,11 @@ public final class BlockActions extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + _allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill); effected.startParalyze(); // Cancel running skill casters. diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 0b7b8711a3..65f31caebb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -54,10 +54,14 @@ public final class Fear extends AbstractEffect @Override public boolean canStart(L2Character effector, L2Character effected, Skill skill) { - final L2Character creature = effected; - return creature.isPlayer() || creature.isSummon() || (creature.isAttackable() && // - !((creature instanceof L2DefenderInstance) || (creature instanceof L2FortCommanderInstance) || // - (creature instanceof L2SiegeFlagInstance) || (creature.getTemplate().getRace() == Race.SIEGE_WEAPON))); + if ((effected == null) || effected.isRaid()) + { + return false; + } + + return effected.isPlayer() || effected.isSummon() || (effected.isAttackable() // + && !((effected instanceof L2DefenderInstance) || (effected instanceof L2FortCommanderInstance) // + || (effected instanceof L2SiegeFlagInstance) || (effected.getTemplate().getRace() == Race.SIEGE_WEAPON))); } @Override diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 3b4d69cf20..9ac65e4f77 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -102,6 +102,11 @@ public final class KnockBack extends AbstractEffect private void knockBack(L2Character effector, L2Character effected) { + if ((effected == null) || effected.isRaid()) + { + return; + } + final double radians = Math.toRadians(Util.calculateAngleFrom(effector, effected)); final int x = (int) (effected.getX() + (_distance * Math.cos(radians))); final int y = (int) (effected.getY() + (_distance * Math.sin(radians))); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62bb12ab47..e0d2460c47 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -49,6 +49,11 @@ public final class Mute extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.abortCast(); effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d81d8db8fe..6a20f5d0a0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -61,6 +61,12 @@ public final class PullBack extends AbstractEffect @Override public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + // Prevent pulling raids. + if ((effected == null) || effected.isRaid()) + { + return; + } + // Prevent pulling NPCs. if (!effected.isPlayable() && !effected.isMonster()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Root.java index e73d6ab674..f83b0e4b65 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -59,6 +59,11 @@ public final class Root extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.stopMove(null); effected.getAI().notifyEvent(CtrlEvent.EVT_ROOTED); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index f56ca977e6..af2ca0c13c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -60,6 +60,11 @@ public final class BlockActions extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + _allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill); effected.startParalyze(); // Cancel running skill casters. diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 0b7b8711a3..65f31caebb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -54,10 +54,14 @@ public final class Fear extends AbstractEffect @Override public boolean canStart(L2Character effector, L2Character effected, Skill skill) { - final L2Character creature = effected; - return creature.isPlayer() || creature.isSummon() || (creature.isAttackable() && // - !((creature instanceof L2DefenderInstance) || (creature instanceof L2FortCommanderInstance) || // - (creature instanceof L2SiegeFlagInstance) || (creature.getTemplate().getRace() == Race.SIEGE_WEAPON))); + if ((effected == null) || effected.isRaid()) + { + return false; + } + + return effected.isPlayer() || effected.isSummon() || (effected.isAttackable() // + && !((effected instanceof L2DefenderInstance) || (effected instanceof L2FortCommanderInstance) // + || (effected instanceof L2SiegeFlagInstance) || (effected.getTemplate().getRace() == Race.SIEGE_WEAPON))); } @Override diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 3b4d69cf20..9ac65e4f77 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -102,6 +102,11 @@ public final class KnockBack extends AbstractEffect private void knockBack(L2Character effector, L2Character effected) { + if ((effected == null) || effected.isRaid()) + { + return; + } + final double radians = Math.toRadians(Util.calculateAngleFrom(effector, effected)); final int x = (int) (effected.getX() + (_distance * Math.cos(radians))); final int y = (int) (effected.getY() + (_distance * Math.sin(radians))); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62bb12ab47..e0d2460c47 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -49,6 +49,11 @@ public final class Mute extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.abortCast(); effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d81d8db8fe..6a20f5d0a0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -61,6 +61,12 @@ public final class PullBack extends AbstractEffect @Override public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + // Prevent pulling raids. + if ((effected == null) || effected.isRaid()) + { + return; + } + // Prevent pulling NPCs. if (!effected.isPlayable() && !effected.isMonster()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Root.java index e73d6ab674..f83b0e4b65 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -59,6 +59,11 @@ public final class Root extends AbstractEffect @Override public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { + if ((effected == null) || effected.isRaid()) + { + return; + } + effected.stopMove(null); effected.getAI().notifyEvent(CtrlEvent.EVT_ROOTED); }