From 340338d8209c99dcd0a0ef3b596d8c6314cc446a Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 21 Sep 2019 08:25:44 +0000 Subject: [PATCH] Fixed GardenWatchman AI spawn NPE. --- .../data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java | 2 +- .../data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java | 2 +- .../data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java | 2 +- .../data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java | 2 +- .../data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java | 2 +- .../data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java | 2 +- .../data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java index c5a5a50f71..34540ea5b8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java @@ -54,7 +54,7 @@ public class GardenWatchman extends AbstractNpcAI { case "SPAWN_TRAP": { - if (!npc.isInCombat()) + if ((npc != null) && npc.isSpawned() && !npc.isInCombat()) { npc.doCast(TRAP_SETUP.getSkill()); final Npc trap = addSpawn((getRandom(10) < 5) ? GENESIS_TRAP_1 : GENESIS_TRAP_2, npc, true, 90000, false); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java index c5a5a50f71..34540ea5b8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java @@ -54,7 +54,7 @@ public class GardenWatchman extends AbstractNpcAI { case "SPAWN_TRAP": { - if (!npc.isInCombat()) + if ((npc != null) && npc.isSpawned() && !npc.isInCombat()) { npc.doCast(TRAP_SETUP.getSkill()); final Npc trap = addSpawn((getRandom(10) < 5) ? GENESIS_TRAP_1 : GENESIS_TRAP_2, npc, true, 90000, false); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java index c5a5a50f71..34540ea5b8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java @@ -54,7 +54,7 @@ public class GardenWatchman extends AbstractNpcAI { case "SPAWN_TRAP": { - if (!npc.isInCombat()) + if ((npc != null) && npc.isSpawned() && !npc.isInCombat()) { npc.doCast(TRAP_SETUP.getSkill()); final Npc trap = addSpawn((getRandom(10) < 5) ? GENESIS_TRAP_1 : GENESIS_TRAP_2, npc, true, 90000, false); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java index c5a5a50f71..34540ea5b8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java @@ -54,7 +54,7 @@ public class GardenWatchman extends AbstractNpcAI { case "SPAWN_TRAP": { - if (!npc.isInCombat()) + if ((npc != null) && npc.isSpawned() && !npc.isInCombat()) { npc.doCast(TRAP_SETUP.getSkill()); final Npc trap = addSpawn((getRandom(10) < 5) ? GENESIS_TRAP_1 : GENESIS_TRAP_2, npc, true, 90000, false); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java index c5a5a50f71..34540ea5b8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java @@ -54,7 +54,7 @@ public class GardenWatchman extends AbstractNpcAI { case "SPAWN_TRAP": { - if (!npc.isInCombat()) + if ((npc != null) && npc.isSpawned() && !npc.isInCombat()) { npc.doCast(TRAP_SETUP.getSkill()); final Npc trap = addSpawn((getRandom(10) < 5) ? GENESIS_TRAP_1 : GENESIS_TRAP_2, npc, true, 90000, false); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java index c5a5a50f71..34540ea5b8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java @@ -54,7 +54,7 @@ public class GardenWatchman extends AbstractNpcAI { case "SPAWN_TRAP": { - if (!npc.isInCombat()) + if ((npc != null) && npc.isSpawned() && !npc.isInCombat()) { npc.doCast(TRAP_SETUP.getSkill()); final Npc trap = addSpawn((getRandom(10) < 5) ? GENESIS_TRAP_1 : GENESIS_TRAP_2, npc, true, 90000, false); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java index c5a5a50f71..34540ea5b8 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java @@ -54,7 +54,7 @@ public class GardenWatchman extends AbstractNpcAI { case "SPAWN_TRAP": { - if (!npc.isInCombat()) + if ((npc != null) && npc.isSpawned() && !npc.isInCombat()) { npc.doCast(TRAP_SETUP.getSkill()); final Npc trap = addSpawn((getRandom(10) < 5) ? GENESIS_TRAP_1 : GENESIS_TRAP_2, npc, true, 90000, false);