From 6aa09924c0bc9400445e06dd162d96b0368f29dc Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 19 Apr 2017 20:21:55 +0000 Subject: [PATCH] Fixed SilentValley NPE. Contributed by gigilo1968. --- .../game/data/scripts/ai/areas/SilentValley/SilentValley.java | 2 +- .../game/data/scripts/ai/areas/SilentValley/SilentValley.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java index 672fdf09ef..6af37c7710 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java @@ -153,7 +153,7 @@ public final class SilentValley extends AbstractNpcAI if (creature.isPlayable()) { final L2PcInstance player = (isSummon) ? ((L2Summon) creature).getOwner() : creature.getActingPlayer(); - if ((npc.getId() == GUARD1) || (npc.getId() == GUARD2)) + if ((npc != null) && ((npc.getId() == GUARD1) || (npc.getId() == GUARD2))) { npc.setTarget(player); npc.doCast(BLAZE.getSkill()); diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java index 672fdf09ef..6af37c7710 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java @@ -153,7 +153,7 @@ public final class SilentValley extends AbstractNpcAI if (creature.isPlayable()) { final L2PcInstance player = (isSummon) ? ((L2Summon) creature).getOwner() : creature.getActingPlayer(); - if ((npc.getId() == GUARD1) || (npc.getId() == GUARD2)) + if ((npc != null) && ((npc.getId() == GUARD1) || (npc.getId() == GUARD2))) { npc.setTarget(player); npc.doCast(BLAZE.getSkill());