diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index d6213f670b..371b0e6f58 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index a23d21fa77..289fc39e34 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + if (_castSkillId != event.getSkill().getId()) { return; } - if (_castSkillId != event.getSkill().getId()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index d6213f670b..371b0e6f58 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index a23d21fa77..289fc39e34 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + if (_castSkillId != event.getSkill().getId()) { return; } - if (_castSkillId != event.getSkill().getId()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index d6213f670b..371b0e6f58 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index a23d21fa77..289fc39e34 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + if (_castSkillId != event.getSkill().getId()) { return; } - if (_castSkillId != event.getSkill().getId()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index d6213f670b..371b0e6f58 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index a23d21fa77..289fc39e34 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + if (_castSkillId != event.getSkill().getId()) { return; } - if (_castSkillId != event.getSkill().getId()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index d6213f670b..371b0e6f58 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index a23d21fa77..289fc39e34 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + if (_castSkillId != event.getSkill().getId()) { return; } - if (_castSkillId != event.getSkill().getId()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index d6213f670b..371b0e6f58 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index a23d21fa77..289fc39e34 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + if (_castSkillId != event.getSkill().getId()) { return; } - if (_castSkillId != event.getSkill().getId()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index d6213f670b..371b0e6f58 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index a23d21fa77..289fc39e34 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + if (_castSkillId != event.getSkill().getId()) { return; } - if (_castSkillId != event.getSkill().getId()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index d6213f670b..371b0e6f58 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index a23d21fa77..289fc39e34 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + if (_castSkillId != event.getSkill().getId()) { return; } - if (_castSkillId != event.getSkill().getId()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index d6213f670b..371b0e6f58 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index a23d21fa77..289fc39e34 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + if (_castSkillId != event.getSkill().getId()) { return; } - if (_castSkillId != event.getSkill().getId()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index d6213f670b..371b0e6f58 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index a23d21fa77..289fc39e34 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + if (_castSkillId != event.getSkill().getId()) { return; } - if (_castSkillId != event.getSkill().getId()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index d6213f670b..371b0e6f58 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index a23d21fa77..289fc39e34 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + if (_castSkillId != event.getSkill().getId()) { return; } - if (_castSkillId != event.getSkill().getId()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index d6213f670b..371b0e6f58 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index a23d21fa77..289fc39e34 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + if (_castSkillId != event.getSkill().getId()) { return; } - if (_castSkillId != event.getSkill().getId()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index d6213f670b..371b0e6f58 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index a23d21fa77..289fc39e34 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + if (_castSkillId != event.getSkill().getId()) { return; } - if (_castSkillId != event.getSkill().getId()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index d6213f670b..371b0e6f58 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index a23d21fa77..289fc39e34 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + if (_castSkillId != event.getSkill().getId()) { return; } - if (_castSkillId != event.getSkill().getId()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index d6213f670b..371b0e6f58 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index a23d21fa77..289fc39e34 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + if (_castSkillId != event.getSkill().getId()) { return; } - if (_castSkillId != event.getSkill().getId()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index d6213f670b..371b0e6f58 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index a23d21fa77..289fc39e34 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + if (_castSkillId != event.getSkill().getId()) { return; } - if (_castSkillId != event.getSkill().getId()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index d6213f670b..371b0e6f58 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index a23d21fa77..289fc39e34 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + if (_castSkillId != event.getSkill().getId()) { return; } - if (_castSkillId != event.getSkill().getId()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index d6213f670b..371b0e6f58 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index a23d21fa77..289fc39e34 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + if (_castSkillId != event.getSkill().getId()) { return; } - if (_castSkillId != event.getSkill().getId()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index d6213f670b..371b0e6f58 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index a23d21fa77..289fc39e34 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + if (_castSkillId != event.getSkill().getId()) { return; } - if (_castSkillId != event.getSkill().getId()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index d6213f670b..371b0e6f58 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index a23d21fa77..289fc39e34 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + if (_castSkillId != event.getSkill().getId()) { return; } - if (_castSkillId != event.getSkill().getId()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index d6213f670b..371b0e6f58 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index a23d21fa77..289fc39e34 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + if (_castSkillId != event.getSkill().getId()) { return; } - if (_castSkillId != event.getSkill().getId()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index d6213f670b..371b0e6f58 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index a23d21fa77..289fc39e34 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + if (_castSkillId != event.getSkill().getId()) { return; } - if (_castSkillId != event.getSkill().getId()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index d6213f670b..371b0e6f58 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -79,7 +79,13 @@ public class TriggerSkillByMagicType extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -94,7 +100,7 @@ public class TriggerSkillByMagicType extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index a23d21fa77..289fc39e34 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -78,12 +78,18 @@ public class TriggerSkillBySkill extends AbstractEffect private void onSkillUseEvent(OnCreatureSkillFinishCast event) { - if (!event.getTarget().isCreature()) + if (_castSkillId != event.getSkill().getId()) { return; } - if (_castSkillId != event.getSkill().getId()) + WorldObject target = event.getTarget(); + if (target == null) + { + return; + } + + if (!target.isCreature()) { return; } @@ -93,7 +99,7 @@ public class TriggerSkillBySkill extends AbstractEffect return; } - WorldObject target = null; + target = null; try { target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);