From 774bd380da3c4e411dfb73a2e7a183ce1e33ec25 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 26 Mar 2020 16:07:34 +0000 Subject: [PATCH] Additionally check if LastImperialTomb portraits are null. --- .../game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java | 2 +- .../game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java | 2 +- .../game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java | 2 +- .../game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java | 2 +- .../game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java | 2 +- .../game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java | 2 +- .../game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java | 2 +- .../game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java | 2 +- .../scripts/instances/LastImperialTomb/LastImperialTomb.java | 2 +- .../scripts/instances/LastImperialTomb/LastImperialTomb.java | 2 +- .../game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java index b839e0abe6..4b0eb848f5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java @@ -446,7 +446,7 @@ public class LastImperialTomb extends AbstractInstance if (world != null) { final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); - if (!portraits.isEmpty()) + if ((portraits != null) && !portraits.isEmpty()) { final List demons = world.getParameters().getList("demons", Npc.class); for (int i : portraits.values()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java index b839e0abe6..4b0eb848f5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java @@ -446,7 +446,7 @@ public class LastImperialTomb extends AbstractInstance if (world != null) { final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); - if (!portraits.isEmpty()) + if ((portraits != null) && !portraits.isEmpty()) { final List demons = world.getParameters().getList("demons", Npc.class); for (int i : portraits.values()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java index b839e0abe6..4b0eb848f5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java @@ -446,7 +446,7 @@ public class LastImperialTomb extends AbstractInstance if (world != null) { final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); - if (!portraits.isEmpty()) + if ((portraits != null) && !portraits.isEmpty()) { final List demons = world.getParameters().getList("demons", Npc.class); for (int i : portraits.values()) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java index b839e0abe6..4b0eb848f5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java @@ -446,7 +446,7 @@ public class LastImperialTomb extends AbstractInstance if (world != null) { final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); - if (!portraits.isEmpty()) + if ((portraits != null) && !portraits.isEmpty()) { final List demons = world.getParameters().getList("demons", Npc.class); for (int i : portraits.values()) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java index b839e0abe6..4b0eb848f5 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java @@ -446,7 +446,7 @@ public class LastImperialTomb extends AbstractInstance if (world != null) { final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); - if (!portraits.isEmpty()) + if ((portraits != null) && !portraits.isEmpty()) { final List demons = world.getParameters().getList("demons", Npc.class); for (int i : portraits.values()) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java index 6140589ccd..75491bd62f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java @@ -446,7 +446,7 @@ public class LastImperialTomb extends AbstractInstance if (world != null) { final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); - if (!portraits.isEmpty()) + if ((portraits != null) && !portraits.isEmpty()) { final List demons = world.getParameters().getList("demons", Npc.class); for (int i : portraits.values()) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java index 6140589ccd..75491bd62f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java @@ -446,7 +446,7 @@ public class LastImperialTomb extends AbstractInstance if (world != null) { final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); - if (!portraits.isEmpty()) + if ((portraits != null) && !portraits.isEmpty()) { final List demons = world.getParameters().getList("demons", Npc.class); for (int i : portraits.values()) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java index b839e0abe6..4b0eb848f5 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java @@ -446,7 +446,7 @@ public class LastImperialTomb extends AbstractInstance if (world != null) { final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); - if (!portraits.isEmpty()) + if ((portraits != null) && !portraits.isEmpty()) { final List demons = world.getParameters().getList("demons", Npc.class); for (int i : portraits.values()) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java index 45f5b4d477..71e68d6af2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java @@ -448,7 +448,7 @@ public class LastImperialTomb extends AbstractInstance if (world != null) { final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); - if (!portraits.isEmpty()) + if ((portraits != null) && !portraits.isEmpty()) { final List demons = world.getParameters().getList("demons", Npc.class); for (int i : portraits.values()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java index 45f5b4d477..71e68d6af2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java @@ -448,7 +448,7 @@ public class LastImperialTomb extends AbstractInstance if (world != null) { final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); - if (!portraits.isEmpty()) + if ((portraits != null) && !portraits.isEmpty()) { final List demons = world.getParameters().getList("demons", Npc.class); for (int i : portraits.values()) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java index b839e0abe6..4b0eb848f5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java @@ -446,7 +446,7 @@ public class LastImperialTomb extends AbstractInstance if (world != null) { final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); - if (!portraits.isEmpty()) + if ((portraits != null) && !portraits.isEmpty()) { final List demons = world.getParameters().getList("demons", Npc.class); for (int i : portraits.values())