From 27dc3eb50621369266cea0dba3424e911cb5b297 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 23 Jul 2021 23:10:58 +0000 Subject: [PATCH] Fixed probable EnemySummon targethandler NPE. Contributed by Sahar. --- .../game/data/scripts/handlers/targethandlers/EnemySummon.java | 2 +- .../game/data/scripts/handlers/targethandlers/EnemySummon.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/targethandlers/EnemySummon.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/targethandlers/EnemySummon.java index c4604fae12..c23a4e482d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/targethandlers/EnemySummon.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/targethandlers/EnemySummon.java @@ -32,7 +32,7 @@ public class EnemySummon implements ITargetTypeHandler @Override public WorldObject[] getTargetList(Skill skill, Creature creature, boolean onlyFirst, Creature target) { - if (target.isSummon()) + if ((target != null) && target.isSummon()) { final Summon targetSummon = (Summon) target; if ((creature.isPlayer() && (creature.getSummon() != targetSummon) && !targetSummon.isDead() && ((targetSummon.getOwner().getPvpFlag() != 0) || (targetSummon.getOwner().getKarma() > 0))) || (targetSummon.getOwner().isInsideZone(ZoneId.PVP) && creature.getActingPlayer().isInsideZone(ZoneId.PVP)) || (targetSummon.getOwner().isInDuel() && creature.getActingPlayer().isInDuel() && (targetSummon.getOwner().getDuelId() == creature.getActingPlayer().getDuelId()))) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/EnemySummon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/EnemySummon.java index c4604fae12..c23a4e482d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/EnemySummon.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/EnemySummon.java @@ -32,7 +32,7 @@ public class EnemySummon implements ITargetTypeHandler @Override public WorldObject[] getTargetList(Skill skill, Creature creature, boolean onlyFirst, Creature target) { - if (target.isSummon()) + if ((target != null) && target.isSummon()) { final Summon targetSummon = (Summon) target; if ((creature.isPlayer() && (creature.getSummon() != targetSummon) && !targetSummon.isDead() && ((targetSummon.getOwner().getPvpFlag() != 0) || (targetSummon.getOwner().getKarma() > 0))) || (targetSummon.getOwner().isInsideZone(ZoneId.PVP) && creature.getActingPlayer().isInsideZone(ZoneId.PVP)) || (targetSummon.getOwner().isInDuel() && creature.getActingPlayer().isInDuel() && (targetSummon.getOwner().getDuelId() == creature.getActingPlayer().getDuelId())))