lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent NPE when spawning demons.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-02-07 14:24:29 +00:00
parent 5d2e2eb5ea
commit 5c414b0d8e
11 changed files with 143 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java vendored
View File

@@ -446,21 +446,24 @@ public class LastImperialTomb extends AbstractInstance
case "SPAWN_DEMONS": case "SPAWN_DEMONS":
{ {
final Instance world = player.getInstanceWorld(); final Instance world = player.getInstanceWorld();
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); if (world != null)
if (!portraits.isEmpty())
{ {
final List<Npc> demons = world.getParameters().getList("demons", Npc.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
for (int i : portraits.values()) if (!portraits.isEmpty())
{ {
if (demons.size() > MAX_DEMONS) final List<Npc> 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()); world.setParameter("demons", demons);
demons.add(demon); 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; break;
} }

23
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java vendored
View File

@@ -446,21 +446,24 @@ public class LastImperialTomb extends AbstractInstance
case "SPAWN_DEMONS": case "SPAWN_DEMONS":
{ {
final Instance world = player.getInstanceWorld(); final Instance world = player.getInstanceWorld();
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); if (world != null)
if (!portraits.isEmpty())
{ {
final List<Npc> demons = world.getParameters().getList("demons", Npc.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
for (int i : portraits.values()) if (!portraits.isEmpty())
{ {
if (demons.size() > MAX_DEMONS) final List<Npc> 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()); world.setParameter("demons", demons);
demons.add(demon); 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; break;
} }

23
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java vendored
View File

@@ -446,21 +446,24 @@ public class LastImperialTomb extends AbstractInstance
case "SPAWN_DEMONS": case "SPAWN_DEMONS":
{ {
final Instance world = player.getInstanceWorld(); final Instance world = player.getInstanceWorld();
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); if (world != null)
if (!portraits.isEmpty())
{ {
final List<Npc> demons = world.getParameters().getList("demons", Npc.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
for (int i : portraits.values()) if (!portraits.isEmpty())
{ {
if (demons.size() > MAX_DEMONS) final List<Npc> 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()); world.setParameter("demons", demons);
demons.add(demon); 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; break;
} }

23
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java vendored
View File

@@ -446,21 +446,24 @@ public class LastImperialTomb extends AbstractInstance
case "SPAWN_DEMONS": case "SPAWN_DEMONS":
{ {
final Instance world = player.getInstanceWorld(); final Instance world = player.getInstanceWorld();
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); if (world != null)
if (!portraits.isEmpty())
{ {
final List<Npc> demons = world.getParameters().getList("demons", Npc.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
for (int i : portraits.values()) if (!portraits.isEmpty())
{ {
if (demons.size() > MAX_DEMONS) final List<Npc> 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()); world.setParameter("demons", demons);
demons.add(demon); 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; break;
} }

23
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java vendored
View File

@@ -446,21 +446,24 @@ public class LastImperialTomb extends AbstractInstance
case "SPAWN_DEMONS": case "SPAWN_DEMONS":
{ {
final Instance world = player.getInstanceWorld(); final Instance world = player.getInstanceWorld();
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); if (world != null)
if (!portraits.isEmpty())
{ {
final List<Npc> demons = world.getParameters().getList("demons", Npc.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
for (int i : portraits.values()) if (!portraits.isEmpty())
{ {
if (demons.size() > MAX_DEMONS) final List<Npc> 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()); world.setParameter("demons", demons);
demons.add(demon); 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; break;
} }

23
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java vendored
View File

@@ -446,21 +446,24 @@ public class LastImperialTomb extends AbstractInstance
case "SPAWN_DEMONS": case "SPAWN_DEMONS":
{ {
final Instance world = player.getInstanceWorld(); final Instance world = player.getInstanceWorld();
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); if (world != null)
if (!portraits.isEmpty())
{ {
final List<Npc> demons = world.getParameters().getList("demons", Npc.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
for (int i : portraits.values()) if (!portraits.isEmpty())
{ {
if (demons.size() > MAX_DEMONS) final List<Npc> 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()); world.setParameter("demons", demons);
demons.add(demon); 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; break;
} }

23
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java vendored
View File

@@ -446,21 +446,24 @@ public class LastImperialTomb extends AbstractInstance
case "SPAWN_DEMONS": case "SPAWN_DEMONS":
{ {
final Instance world = player.getInstanceWorld(); final Instance world = player.getInstanceWorld();
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); if (world != null)
if (!portraits.isEmpty())
{ {
final List<Npc> demons = world.getParameters().getList("demons", Npc.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
for (int i : portraits.values()) if (!portraits.isEmpty())
{ {
if (demons.size() > MAX_DEMONS) final List<Npc> 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()); world.setParameter("demons", demons);
demons.add(demon); 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; break;
} }

23
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java vendored
View File

@@ -446,21 +446,24 @@ public class LastImperialTomb extends AbstractInstance
case "SPAWN_DEMONS": case "SPAWN_DEMONS":
{ {
final Instance world = player.getInstanceWorld(); final Instance world = player.getInstanceWorld();
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); if (world != null)
if (!portraits.isEmpty())
{ {
final List<Npc> demons = world.getParameters().getList("demons", Npc.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
for (int i : portraits.values()) if (!portraits.isEmpty())
{ {
if (demons.size() > MAX_DEMONS) final List<Npc> 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()); world.setParameter("demons", demons);
demons.add(demon); 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; break;
} }

23
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java vendored
View File

@@ -448,21 +448,24 @@ public class LastImperialTomb extends AbstractInstance
case "SPAWN_DEMONS": case "SPAWN_DEMONS":
{ {
final Instance world = player.getInstanceWorld(); final Instance world = player.getInstanceWorld();
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); if (world != null)
if (!portraits.isEmpty())
{ {
final List<Npc> demons = world.getParameters().getList("demons", Npc.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
for (int i : portraits.values()) if (!portraits.isEmpty())
{ {
if (demons.size() > MAX_DEMONS) final List<Npc> 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()); world.setParameter("demons", demons);
demons.add(demon); 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; break;
} }

23
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java vendored
View File

@@ -448,21 +448,24 @@ public class LastImperialTomb extends AbstractInstance
case "SPAWN_DEMONS": case "SPAWN_DEMONS":
{ {
final Instance world = player.getInstanceWorld(); final Instance world = player.getInstanceWorld();
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); if (world != null)
if (!portraits.isEmpty())
{ {
final List<Npc> demons = world.getParameters().getList("demons", Npc.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
for (int i : portraits.values()) if (!portraits.isEmpty())
{ {
if (demons.size() > MAX_DEMONS) final List<Npc> 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()); world.setParameter("demons", demons);
demons.add(demon); 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; break;
} }

23
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java vendored
View File

@@ -446,21 +446,24 @@ public class LastImperialTomb extends AbstractInstance
case "SPAWN_DEMONS": case "SPAWN_DEMONS":
{ {
final Instance world = player.getInstanceWorld(); final Instance world = player.getInstanceWorld();
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); if (world != null)
if (!portraits.isEmpty())
{ {
final List<Npc> demons = world.getParameters().getList("demons", Npc.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
for (int i : portraits.values()) if (!portraits.isEmpty())
{ {
if (demons.size() > MAX_DEMONS) final List<Npc> 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()); world.setParameter("demons", demons);
demons.add(demon); 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; break;
} }