From 5c414b0d8eb18e51570822438c6b9bc0063f151c Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 7 Feb 2020 14:24:29 +0000 Subject: [PATCH] Prevent NPE when spawning demons. --- .../ai/bosses/Frintezza/LastImperialTomb.java | 23 +++++++++++-------- .../ai/bosses/Frintezza/LastImperialTomb.java | 23 +++++++++++-------- .../ai/bosses/Frintezza/LastImperialTomb.java | 23 +++++++++++-------- .../ai/bosses/Frintezza/LastImperialTomb.java | 23 +++++++++++-------- .../ai/bosses/Frintezza/LastImperialTomb.java | 23 +++++++++++-------- .../ai/bosses/Frintezza/LastImperialTomb.java | 23 +++++++++++-------- .../ai/bosses/Frintezza/LastImperialTomb.java | 23 +++++++++++-------- .../ai/bosses/Frintezza/LastImperialTomb.java | 23 +++++++++++-------- .../LastImperialTomb/LastImperialTomb.java | 23 +++++++++++-------- .../LastImperialTomb/LastImperialTomb.java | 23 +++++++++++-------- .../ai/bosses/Frintezza/LastImperialTomb.java | 23 +++++++++++-------- 11 files changed, 143 insertions(+), 110 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 b5b6810373..3da589ea93 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,21 +446,24 @@ public class LastImperialTomb extends AbstractInstance case "SPAWN_DEMONS": { final Instance world = player.getInstanceWorld(); - final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); - if (!portraits.isEmpty()) + if (world != null) { - final List demons = world.getParameters().getList("demons", Npc.class); - for (int i : portraits.values()) + final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); + if (!portraits.isEmpty()) { - if (demons.size() > MAX_DEMONS) + final List demons = world.getParameters().getList("demons", Npc.class); + for (int i : portraits.values()) { - break; + if (demons.size() > MAX_DEMONS) + { + break; + } + final Npc demon = addSpawn(PORTRAIT_SPAWNS[i][0] + 2, PORTRAIT_SPAWNS[i][5], PORTRAIT_SPAWNS[i][6], PORTRAIT_SPAWNS[i][7], PORTRAIT_SPAWNS[i][8], false, 0, false, world.getId()); + demons.add(demon); } - final Npc demon = addSpawn(PORTRAIT_SPAWNS[i][0] + 2, PORTRAIT_SPAWNS[i][5], PORTRAIT_SPAWNS[i][6], PORTRAIT_SPAWNS[i][7], PORTRAIT_SPAWNS[i][8], false, 0, false, world.getId()); - demons.add(demon); + world.setParameter("demons", demons); + startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); } - world.setParameter("demons", demons); - startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); } break; } 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 b5b6810373..3da589ea93 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,21 +446,24 @@ public class LastImperialTomb extends AbstractInstance case "SPAWN_DEMONS": { final Instance world = player.getInstanceWorld(); - final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); - if (!portraits.isEmpty()) + if (world != null) { - final List demons = world.getParameters().getList("demons", Npc.class); - for (int i : portraits.values()) + final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); + if (!portraits.isEmpty()) { - if (demons.size() > MAX_DEMONS) + final List demons = world.getParameters().getList("demons", Npc.class); + for (int i : portraits.values()) { - break; + if (demons.size() > MAX_DEMONS) + { + break; + } + final Npc demon = addSpawn(PORTRAIT_SPAWNS[i][0] + 2, PORTRAIT_SPAWNS[i][5], PORTRAIT_SPAWNS[i][6], PORTRAIT_SPAWNS[i][7], PORTRAIT_SPAWNS[i][8], false, 0, false, world.getId()); + demons.add(demon); } - final Npc demon = addSpawn(PORTRAIT_SPAWNS[i][0] + 2, PORTRAIT_SPAWNS[i][5], PORTRAIT_SPAWNS[i][6], PORTRAIT_SPAWNS[i][7], PORTRAIT_SPAWNS[i][8], false, 0, false, world.getId()); - demons.add(demon); + world.setParameter("demons", demons); + startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); } - world.setParameter("demons", demons); - startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); } break; } 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 b5b6810373..3da589ea93 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,21 +446,24 @@ public class LastImperialTomb extends AbstractInstance case "SPAWN_DEMONS": { final Instance world = player.getInstanceWorld(); - final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); - if (!portraits.isEmpty()) + if (world != null) { - final List demons = world.getParameters().getList("demons", Npc.class); - for (int i : portraits.values()) + final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); + if (!portraits.isEmpty()) { - if (demons.size() > MAX_DEMONS) + final List demons = world.getParameters().getList("demons", Npc.class); + for (int i : portraits.values()) { - break; + if (demons.size() > MAX_DEMONS) + { + break; + } + final Npc demon = addSpawn(PORTRAIT_SPAWNS[i][0] + 2, PORTRAIT_SPAWNS[i][5], PORTRAIT_SPAWNS[i][6], PORTRAIT_SPAWNS[i][7], PORTRAIT_SPAWNS[i][8], false, 0, false, world.getId()); + demons.add(demon); } - final Npc demon = addSpawn(PORTRAIT_SPAWNS[i][0] + 2, PORTRAIT_SPAWNS[i][5], PORTRAIT_SPAWNS[i][6], PORTRAIT_SPAWNS[i][7], PORTRAIT_SPAWNS[i][8], false, 0, false, world.getId()); - demons.add(demon); + world.setParameter("demons", demons); + startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); } - world.setParameter("demons", demons); - startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); } break; } 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 b5b6810373..3da589ea93 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,21 +446,24 @@ public class LastImperialTomb extends AbstractInstance case "SPAWN_DEMONS": { final Instance world = player.getInstanceWorld(); - final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); - if (!portraits.isEmpty()) + if (world != null) { - final List demons = world.getParameters().getList("demons", Npc.class); - for (int i : portraits.values()) + final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); + if (!portraits.isEmpty()) { - if (demons.size() > MAX_DEMONS) + final List demons = world.getParameters().getList("demons", Npc.class); + for (int i : portraits.values()) { - break; + if (demons.size() > MAX_DEMONS) + { + break; + } + final Npc demon = addSpawn(PORTRAIT_SPAWNS[i][0] + 2, PORTRAIT_SPAWNS[i][5], PORTRAIT_SPAWNS[i][6], PORTRAIT_SPAWNS[i][7], PORTRAIT_SPAWNS[i][8], false, 0, false, world.getId()); + demons.add(demon); } - final Npc demon = addSpawn(PORTRAIT_SPAWNS[i][0] + 2, PORTRAIT_SPAWNS[i][5], PORTRAIT_SPAWNS[i][6], PORTRAIT_SPAWNS[i][7], PORTRAIT_SPAWNS[i][8], false, 0, false, world.getId()); - demons.add(demon); + world.setParameter("demons", demons); + startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); } - world.setParameter("demons", demons); - startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); } break; } 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 b5b6810373..3da589ea93 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,21 +446,24 @@ public class LastImperialTomb extends AbstractInstance case "SPAWN_DEMONS": { final Instance world = player.getInstanceWorld(); - final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); - if (!portraits.isEmpty()) + if (world != null) { - final List demons = world.getParameters().getList("demons", Npc.class); - for (int i : portraits.values()) + final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); + if (!portraits.isEmpty()) { - if (demons.size() > MAX_DEMONS) + final List demons = world.getParameters().getList("demons", Npc.class); + for (int i : portraits.values()) { - break; + if (demons.size() > MAX_DEMONS) + { + break; + } + final Npc demon = addSpawn(PORTRAIT_SPAWNS[i][0] + 2, PORTRAIT_SPAWNS[i][5], PORTRAIT_SPAWNS[i][6], PORTRAIT_SPAWNS[i][7], PORTRAIT_SPAWNS[i][8], false, 0, false, world.getId()); + demons.add(demon); } - final Npc demon = addSpawn(PORTRAIT_SPAWNS[i][0] + 2, PORTRAIT_SPAWNS[i][5], PORTRAIT_SPAWNS[i][6], PORTRAIT_SPAWNS[i][7], PORTRAIT_SPAWNS[i][8], false, 0, false, world.getId()); - demons.add(demon); + world.setParameter("demons", demons); + startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); } - world.setParameter("demons", demons); - startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); } break; } 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 9ffcef423c..cce418c7ad 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,21 +446,24 @@ public class LastImperialTomb extends AbstractInstance case "SPAWN_DEMONS": { final Instance world = player.getInstanceWorld(); - final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); - if (!portraits.isEmpty()) + if (world != null) { - final List demons = world.getParameters().getList("demons", Npc.class); - for (int i : portraits.values()) + final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); + if (!portraits.isEmpty()) { - if (demons.size() > MAX_DEMONS) + final List demons = world.getParameters().getList("demons", Npc.class); + for (int i : portraits.values()) { - break; + if (demons.size() > MAX_DEMONS) + { + break; + } + final Npc demon = addSpawn(PORTRAIT_SPAWNS[i][0] + 2, PORTRAIT_SPAWNS[i][5], PORTRAIT_SPAWNS[i][6], PORTRAIT_SPAWNS[i][7], PORTRAIT_SPAWNS[i][8], false, 0, false, world.getId()); + demons.add(demon); } - final Npc demon = addSpawn(PORTRAIT_SPAWNS[i][0] + 2, PORTRAIT_SPAWNS[i][5], PORTRAIT_SPAWNS[i][6], PORTRAIT_SPAWNS[i][7], PORTRAIT_SPAWNS[i][8], false, 0, false, world.getId()); - demons.add(demon); + world.setParameter("demons", demons); + startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); } - world.setParameter("demons", demons); - startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); } break; } 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 9ffcef423c..cce418c7ad 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,21 +446,24 @@ public class LastImperialTomb extends AbstractInstance case "SPAWN_DEMONS": { final Instance world = player.getInstanceWorld(); - final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); - if (!portraits.isEmpty()) + if (world != null) { - final List demons = world.getParameters().getList("demons", Npc.class); - for (int i : portraits.values()) + final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); + if (!portraits.isEmpty()) { - if (demons.size() > MAX_DEMONS) + final List demons = world.getParameters().getList("demons", Npc.class); + for (int i : portraits.values()) { - break; + if (demons.size() > MAX_DEMONS) + { + break; + } + final Npc demon = addSpawn(PORTRAIT_SPAWNS[i][0] + 2, PORTRAIT_SPAWNS[i][5], PORTRAIT_SPAWNS[i][6], PORTRAIT_SPAWNS[i][7], PORTRAIT_SPAWNS[i][8], false, 0, false, world.getId()); + demons.add(demon); } - final Npc demon = addSpawn(PORTRAIT_SPAWNS[i][0] + 2, PORTRAIT_SPAWNS[i][5], PORTRAIT_SPAWNS[i][6], PORTRAIT_SPAWNS[i][7], PORTRAIT_SPAWNS[i][8], false, 0, false, world.getId()); - demons.add(demon); + world.setParameter("demons", demons); + startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); } - world.setParameter("demons", demons); - startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); } break; } 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 b5b6810373..3da589ea93 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,21 +446,24 @@ public class LastImperialTomb extends AbstractInstance case "SPAWN_DEMONS": { final Instance world = player.getInstanceWorld(); - final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); - if (!portraits.isEmpty()) + if (world != null) { - final List demons = world.getParameters().getList("demons", Npc.class); - for (int i : portraits.values()) + final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); + if (!portraits.isEmpty()) { - if (demons.size() > MAX_DEMONS) + final List demons = world.getParameters().getList("demons", Npc.class); + for (int i : portraits.values()) { - break; + if (demons.size() > MAX_DEMONS) + { + break; + } + final Npc demon = addSpawn(PORTRAIT_SPAWNS[i][0] + 2, PORTRAIT_SPAWNS[i][5], PORTRAIT_SPAWNS[i][6], PORTRAIT_SPAWNS[i][7], PORTRAIT_SPAWNS[i][8], false, 0, false, world.getId()); + demons.add(demon); } - final Npc demon = addSpawn(PORTRAIT_SPAWNS[i][0] + 2, PORTRAIT_SPAWNS[i][5], PORTRAIT_SPAWNS[i][6], PORTRAIT_SPAWNS[i][7], PORTRAIT_SPAWNS[i][8], false, 0, false, world.getId()); - demons.add(demon); + world.setParameter("demons", demons); + startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); } - world.setParameter("demons", demons); - startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); } break; } 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 336831c3cc..639b79187b 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,21 +448,24 @@ public class LastImperialTomb extends AbstractInstance case "SPAWN_DEMONS": { final Instance world = player.getInstanceWorld(); - final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); - if (!portraits.isEmpty()) + if (world != null) { - final List demons = world.getParameters().getList("demons", Npc.class); - for (int i : portraits.values()) + final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); + if (!portraits.isEmpty()) { - if (demons.size() > MAX_DEMONS) + final List demons = world.getParameters().getList("demons", Npc.class); + for (int i : portraits.values()) { - break; + if (demons.size() > MAX_DEMONS) + { + break; + } + final Npc demon = addSpawn(PORTRAIT_SPAWNS[i][0] + 2, PORTRAIT_SPAWNS[i][5], PORTRAIT_SPAWNS[i][6], PORTRAIT_SPAWNS[i][7], PORTRAIT_SPAWNS[i][8], false, 0, false, world.getId()); + demons.add(demon); } - final Npc demon = addSpawn(PORTRAIT_SPAWNS[i][0] + 2, PORTRAIT_SPAWNS[i][5], PORTRAIT_SPAWNS[i][6], PORTRAIT_SPAWNS[i][7], PORTRAIT_SPAWNS[i][8], false, 0, false, world.getId()); - demons.add(demon); + world.setParameter("demons", demons); + startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); } - world.setParameter("demons", demons); - startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); } break; } 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 d040708687..86813d988d 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,21 +448,24 @@ public class LastImperialTomb extends AbstractInstance case "SPAWN_DEMONS": { final Instance world = player.getInstanceWorld(); - final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); - if (!portraits.isEmpty()) + if (world != null) { - final List demons = world.getParameters().getList("demons", Npc.class); - for (int i : portraits.values()) + final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); + if (!portraits.isEmpty()) { - if (demons.size() > MAX_DEMONS) + final List demons = world.getParameters().getList("demons", Npc.class); + for (int i : portraits.values()) { - break; + if (demons.size() > MAX_DEMONS) + { + break; + } + final Npc demon = addSpawn(PORTRAIT_SPAWNS[i][0] + 2, PORTRAIT_SPAWNS[i][5], PORTRAIT_SPAWNS[i][6], PORTRAIT_SPAWNS[i][7], PORTRAIT_SPAWNS[i][8], false, 0, false, world.getId()); + demons.add(demon); } - final Npc demon = addSpawn(PORTRAIT_SPAWNS[i][0] + 2, PORTRAIT_SPAWNS[i][5], PORTRAIT_SPAWNS[i][6], PORTRAIT_SPAWNS[i][7], PORTRAIT_SPAWNS[i][8], false, 0, false, world.getId()); - demons.add(demon); + world.setParameter("demons", demons); + startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); } - world.setParameter("demons", demons); - startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); } break; } 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 b5b6810373..3da589ea93 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,21 +446,24 @@ public class LastImperialTomb extends AbstractInstance case "SPAWN_DEMONS": { final Instance world = player.getInstanceWorld(); - final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); - if (!portraits.isEmpty()) + if (world != null) { - final List demons = world.getParameters().getList("demons", Npc.class); - for (int i : portraits.values()) + final Map portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); + if (!portraits.isEmpty()) { - if (demons.size() > MAX_DEMONS) + final List demons = world.getParameters().getList("demons", Npc.class); + for (int i : portraits.values()) { - break; + if (demons.size() > MAX_DEMONS) + { + break; + } + final Npc demon = addSpawn(PORTRAIT_SPAWNS[i][0] + 2, PORTRAIT_SPAWNS[i][5], PORTRAIT_SPAWNS[i][6], PORTRAIT_SPAWNS[i][7], PORTRAIT_SPAWNS[i][8], false, 0, false, world.getId()); + demons.add(demon); } - final Npc demon = addSpawn(PORTRAIT_SPAWNS[i][0] + 2, PORTRAIT_SPAWNS[i][5], PORTRAIT_SPAWNS[i][6], PORTRAIT_SPAWNS[i][7], PORTRAIT_SPAWNS[i][8], false, 0, false, world.getId()); - demons.add(demon); + world.setParameter("demons", demons); + startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); } - world.setParameter("demons", demons); - startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); } break; }