From a7cf1ecb3cb484ad6ec81cff0be1d096dee5c7be Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 25 Apr 2022 10:08:06 +0000 Subject: [PATCH] EtisVanEtinaSolo player world NPE fix. --- .../instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java | 8 ++++---- .../instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java | 8 ++++---- .../instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java | 8 ++++---- .../instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java index 875e0d9e9b..70f8a0079d 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java @@ -178,12 +178,12 @@ public class EtisVanEtinaSolo extends AbstractInstance case "checkProgress": { final Instance world = player.getInstanceWorld(); - boolean mobs1 = world.getParameters().getBoolean("CORRIDOR_MOBS_1_SPAWNED", false); - boolean mobs2 = world.getParameters().getBoolean("CORRIDOR_MOBS_2_SPAWNED", false); - boolean mobs3 = world.getParameters().getBoolean("CORRIDOR_MOBS_3_SPAWNED", false); - boolean mobs4 = world.getParameters().getBoolean("CORRIDOR_MOBS_4_SPAWNED", false); if (isInInstance(world)) { + boolean mobs1 = world.getParameters().getBoolean("CORRIDOR_MOBS_1_SPAWNED", false); + boolean mobs2 = world.getParameters().getBoolean("CORRIDOR_MOBS_2_SPAWNED", false); + boolean mobs3 = world.getParameters().getBoolean("CORRIDOR_MOBS_3_SPAWNED", false); + boolean mobs4 = world.getParameters().getBoolean("CORRIDOR_MOBS_4_SPAWNED", false); final Monster monsterCheck = getRandomEntry(World.getInstance().getVisibleObjectsInRange(npc, Monster.class, 2500)); if (monsterCheck == null) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java index 875e0d9e9b..70f8a0079d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java @@ -178,12 +178,12 @@ public class EtisVanEtinaSolo extends AbstractInstance case "checkProgress": { final Instance world = player.getInstanceWorld(); - boolean mobs1 = world.getParameters().getBoolean("CORRIDOR_MOBS_1_SPAWNED", false); - boolean mobs2 = world.getParameters().getBoolean("CORRIDOR_MOBS_2_SPAWNED", false); - boolean mobs3 = world.getParameters().getBoolean("CORRIDOR_MOBS_3_SPAWNED", false); - boolean mobs4 = world.getParameters().getBoolean("CORRIDOR_MOBS_4_SPAWNED", false); if (isInInstance(world)) { + boolean mobs1 = world.getParameters().getBoolean("CORRIDOR_MOBS_1_SPAWNED", false); + boolean mobs2 = world.getParameters().getBoolean("CORRIDOR_MOBS_2_SPAWNED", false); + boolean mobs3 = world.getParameters().getBoolean("CORRIDOR_MOBS_3_SPAWNED", false); + boolean mobs4 = world.getParameters().getBoolean("CORRIDOR_MOBS_4_SPAWNED", false); final Monster monsterCheck = getRandomEntry(World.getInstance().getVisibleObjectsInRange(npc, Monster.class, 2500)); if (monsterCheck == null) { diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java index 875e0d9e9b..70f8a0079d 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java @@ -178,12 +178,12 @@ public class EtisVanEtinaSolo extends AbstractInstance case "checkProgress": { final Instance world = player.getInstanceWorld(); - boolean mobs1 = world.getParameters().getBoolean("CORRIDOR_MOBS_1_SPAWNED", false); - boolean mobs2 = world.getParameters().getBoolean("CORRIDOR_MOBS_2_SPAWNED", false); - boolean mobs3 = world.getParameters().getBoolean("CORRIDOR_MOBS_3_SPAWNED", false); - boolean mobs4 = world.getParameters().getBoolean("CORRIDOR_MOBS_4_SPAWNED", false); if (isInInstance(world)) { + boolean mobs1 = world.getParameters().getBoolean("CORRIDOR_MOBS_1_SPAWNED", false); + boolean mobs2 = world.getParameters().getBoolean("CORRIDOR_MOBS_2_SPAWNED", false); + boolean mobs3 = world.getParameters().getBoolean("CORRIDOR_MOBS_3_SPAWNED", false); + boolean mobs4 = world.getParameters().getBoolean("CORRIDOR_MOBS_4_SPAWNED", false); final Monster monsterCheck = getRandomEntry(World.getInstance().getVisibleObjectsInRange(npc, Monster.class, 2500)); if (monsterCheck == null) { diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java index 875e0d9e9b..70f8a0079d 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java @@ -178,12 +178,12 @@ public class EtisVanEtinaSolo extends AbstractInstance case "checkProgress": { final Instance world = player.getInstanceWorld(); - boolean mobs1 = world.getParameters().getBoolean("CORRIDOR_MOBS_1_SPAWNED", false); - boolean mobs2 = world.getParameters().getBoolean("CORRIDOR_MOBS_2_SPAWNED", false); - boolean mobs3 = world.getParameters().getBoolean("CORRIDOR_MOBS_3_SPAWNED", false); - boolean mobs4 = world.getParameters().getBoolean("CORRIDOR_MOBS_4_SPAWNED", false); if (isInInstance(world)) { + boolean mobs1 = world.getParameters().getBoolean("CORRIDOR_MOBS_1_SPAWNED", false); + boolean mobs2 = world.getParameters().getBoolean("CORRIDOR_MOBS_2_SPAWNED", false); + boolean mobs3 = world.getParameters().getBoolean("CORRIDOR_MOBS_3_SPAWNED", false); + boolean mobs4 = world.getParameters().getBoolean("CORRIDOR_MOBS_4_SPAWNED", false); final Monster monsterCheck = getRandomEntry(World.getInstance().getVisibleObjectsInRange(npc, Monster.class, 2500)); if (monsterCheck == null) {