From 6c0d7b3dc3fe5df1c581466da52a1082dbd8d23d Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 16 Mar 2020 22:06:05 +0000 Subject: [PATCH] Chamber of Prophecies NPC NPE precaution. --- .../instances/ChamberOfProphecies/ChamberOfProphecies.java | 2 +- .../instances/ChamberOfProphecies/ChamberOfProphecies.java | 2 +- .../instances/ChamberOfProphecies/ChamberOfProphecies.java | 2 +- .../instances/ChamberOfProphecies/ChamberOfProphecies.java | 2 +- .../instances/ChamberOfProphecies/ChamberOfProphecies.java | 2 +- .../instances/ChamberOfProphecies/ChamberOfProphecies.java | 2 +- .../instances/ChamberOfProphecies/ChamberOfProphecies.java | 2 +- .../instances/ChamberOfProphecies/ChamberOfProphecies.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java index 0f47b580e9..ee2abfc1dd 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java @@ -242,7 +242,7 @@ public class ChamberOfProphecies extends AbstractInstance case "ATTACK2": { final Instance world = player.getInstanceWorld(); - if (!isInInstance(world)) + if (!isInInstance(world) || (npc == null)) { return null; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java index 0f47b580e9..ee2abfc1dd 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java @@ -242,7 +242,7 @@ public class ChamberOfProphecies extends AbstractInstance case "ATTACK2": { final Instance world = player.getInstanceWorld(); - if (!isInInstance(world)) + if (!isInInstance(world) || (npc == null)) { return null; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java index 0f47b580e9..ee2abfc1dd 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java @@ -242,7 +242,7 @@ public class ChamberOfProphecies extends AbstractInstance case "ATTACK2": { final Instance world = player.getInstanceWorld(); - if (!isInInstance(world)) + if (!isInInstance(world) || (npc == null)) { return null; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java index 0f47b580e9..ee2abfc1dd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java @@ -242,7 +242,7 @@ public class ChamberOfProphecies extends AbstractInstance case "ATTACK2": { final Instance world = player.getInstanceWorld(); - if (!isInInstance(world)) + if (!isInInstance(world) || (npc == null)) { return null; } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java index 403b3b4204..04e41d8ecb 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java @@ -242,7 +242,7 @@ public class ChamberOfProphecies extends AbstractInstance case "ATTACK2": { final Instance world = player.getInstanceWorld(); - if (!isInInstance(world)) + if (!isInInstance(world) || (npc == null)) { return null; } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java index 0f47b580e9..ee2abfc1dd 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java @@ -242,7 +242,7 @@ public class ChamberOfProphecies extends AbstractInstance case "ATTACK2": { final Instance world = player.getInstanceWorld(); - if (!isInInstance(world)) + if (!isInInstance(world) || (npc == null)) { return null; } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java index 0f47b580e9..ee2abfc1dd 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java @@ -242,7 +242,7 @@ public class ChamberOfProphecies extends AbstractInstance case "ATTACK2": { final Instance world = player.getInstanceWorld(); - if (!isInInstance(world)) + if (!isInInstance(world) || (npc == null)) { return null; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java index 996b9ff6bf..9eccd5bc35 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java @@ -242,7 +242,7 @@ public class ChamberOfProphecies extends AbstractInstance case "ATTACK2": { final Instance world = player.getInstanceWorld(); - if (!isInInstance(world)) + if (!isInInstance(world) || (npc == null)) { return null; }