From e2461174d7514f585ef97c5e9286b2416b851c01 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 21 Jan 2019 02:24:54 +0000 Subject: [PATCH] Fixed OpCheckAbnormalSkillCondition target NPE. --- .../skillconditionhandlers/OpCheckAbnormalSkillCondition.java | 2 +- .../skillconditionhandlers/OpCheckAbnormalSkillCondition.java | 2 +- .../skillconditionhandlers/OpCheckAbnormalSkillCondition.java | 2 +- .../skillconditionhandlers/OpCheckAbnormalSkillCondition.java | 2 +- .../skillconditionhandlers/OpCheckAbnormalSkillCondition.java | 2 +- .../skillconditionhandlers/OpCheckAbnormalSkillCondition.java | 2 +- .../skillconditionhandlers/OpCheckAbnormalSkillCondition.java | 2 +- .../skillconditionhandlers/OpCheckAbnormalSkillCondition.java | 2 +- .../skillconditionhandlers/OpCheckAbnormalSkillCondition.java | 2 +- .../skillconditionhandlers/OpCheckAbnormalSkillCondition.java | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java index ccc9c26faa..11289aa8a1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java @@ -53,7 +53,7 @@ public class OpCheckAbnormalSkillCondition implements ISkillCondition } case TARGET: { - if (target.isCharacter()) + if ((target != null) && target.isCharacter()) { return ((L2Character) target).getEffectList().hasAbnormalType(_type, info -> (info.getSkill().getAbnormalLvl() >= _level)) == _hasAbnormal; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java index ccc9c26faa..11289aa8a1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java @@ -53,7 +53,7 @@ public class OpCheckAbnormalSkillCondition implements ISkillCondition } case TARGET: { - if (target.isCharacter()) + if ((target != null) && target.isCharacter()) { return ((L2Character) target).getEffectList().hasAbnormalType(_type, info -> (info.getSkill().getAbnormalLvl() >= _level)) == _hasAbnormal; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java index ccc9c26faa..11289aa8a1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java @@ -53,7 +53,7 @@ public class OpCheckAbnormalSkillCondition implements ISkillCondition } case TARGET: { - if (target.isCharacter()) + if ((target != null) && target.isCharacter()) { return ((L2Character) target).getEffectList().hasAbnormalType(_type, info -> (info.getSkill().getAbnormalLvl() >= _level)) == _hasAbnormal; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java index ccc9c26faa..11289aa8a1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java @@ -53,7 +53,7 @@ public class OpCheckAbnormalSkillCondition implements ISkillCondition } case TARGET: { - if (target.isCharacter()) + if ((target != null) && target.isCharacter()) { return ((L2Character) target).getEffectList().hasAbnormalType(_type, info -> (info.getSkill().getAbnormalLvl() >= _level)) == _hasAbnormal; } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java index ccc9c26faa..11289aa8a1 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java @@ -53,7 +53,7 @@ public class OpCheckAbnormalSkillCondition implements ISkillCondition } case TARGET: { - if (target.isCharacter()) + if ((target != null) && target.isCharacter()) { return ((L2Character) target).getEffectList().hasAbnormalType(_type, info -> (info.getSkill().getAbnormalLvl() >= _level)) == _hasAbnormal; } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java index ccc9c26faa..11289aa8a1 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java @@ -53,7 +53,7 @@ public class OpCheckAbnormalSkillCondition implements ISkillCondition } case TARGET: { - if (target.isCharacter()) + if ((target != null) && target.isCharacter()) { return ((L2Character) target).getEffectList().hasAbnormalType(_type, info -> (info.getSkill().getAbnormalLvl() >= _level)) == _hasAbnormal; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java index ccc9c26faa..11289aa8a1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java @@ -53,7 +53,7 @@ public class OpCheckAbnormalSkillCondition implements ISkillCondition } case TARGET: { - if (target.isCharacter()) + if ((target != null) && target.isCharacter()) { return ((L2Character) target).getEffectList().hasAbnormalType(_type, info -> (info.getSkill().getAbnormalLvl() >= _level)) == _hasAbnormal; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java index ccc9c26faa..11289aa8a1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java @@ -53,7 +53,7 @@ public class OpCheckAbnormalSkillCondition implements ISkillCondition } case TARGET: { - if (target.isCharacter()) + if ((target != null) && target.isCharacter()) { return ((L2Character) target).getEffectList().hasAbnormalType(_type, info -> (info.getSkill().getAbnormalLvl() >= _level)) == _hasAbnormal; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java index ccc9c26faa..11289aa8a1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java @@ -53,7 +53,7 @@ public class OpCheckAbnormalSkillCondition implements ISkillCondition } case TARGET: { - if (target.isCharacter()) + if ((target != null) && target.isCharacter()) { return ((L2Character) target).getEffectList().hasAbnormalType(_type, info -> (info.getSkill().getAbnormalLvl() >= _level)) == _hasAbnormal; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java index ccc9c26faa..11289aa8a1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java @@ -53,7 +53,7 @@ public class OpCheckAbnormalSkillCondition implements ISkillCondition } case TARGET: { - if (target.isCharacter()) + if ((target != null) && target.isCharacter()) { return ((L2Character) target).getEffectList().hasAbnormalType(_type, info -> (info.getSkill().getAbnormalLvl() >= _level)) == _hasAbnormal; }