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

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

@@ -446,6 +446,8 @@ public class LastImperialTomb extends AbstractInstance
case "SPAWN_DEMONS": case "SPAWN_DEMONS":
{ {
final Instance world = player.getInstanceWorld(); final Instance world = player.getInstanceWorld();
if (world != null)
{
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
if (!portraits.isEmpty()) if (!portraits.isEmpty())
{ {
@@ -462,6 +464,7 @@ public class LastImperialTomb extends AbstractInstance
world.setParameter("demons", demons); world.setParameter("demons", demons);
startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false);
} }
}
break; break;
} }
case "PLAY_RANDOM_SONG": case "PLAY_RANDOM_SONG":

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

@@ -446,6 +446,8 @@ public class LastImperialTomb extends AbstractInstance
case "SPAWN_DEMONS": case "SPAWN_DEMONS":
{ {
final Instance world = player.getInstanceWorld(); final Instance world = player.getInstanceWorld();
if (world != null)
{
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
if (!portraits.isEmpty()) if (!portraits.isEmpty())
{ {
@@ -462,6 +464,7 @@ public class LastImperialTomb extends AbstractInstance
world.setParameter("demons", demons); world.setParameter("demons", demons);
startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false);
} }
}
break; break;
} }
case "PLAY_RANDOM_SONG": case "PLAY_RANDOM_SONG":

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

@@ -446,6 +446,8 @@ public class LastImperialTomb extends AbstractInstance
case "SPAWN_DEMONS": case "SPAWN_DEMONS":
{ {
final Instance world = player.getInstanceWorld(); final Instance world = player.getInstanceWorld();
if (world != null)
{
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
if (!portraits.isEmpty()) if (!portraits.isEmpty())
{ {
@@ -462,6 +464,7 @@ public class LastImperialTomb extends AbstractInstance
world.setParameter("demons", demons); world.setParameter("demons", demons);
startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false);
} }
}
break; break;
} }
case "PLAY_RANDOM_SONG": case "PLAY_RANDOM_SONG":

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

@@ -446,6 +446,8 @@ public class LastImperialTomb extends AbstractInstance
case "SPAWN_DEMONS": case "SPAWN_DEMONS":
{ {
final Instance world = player.getInstanceWorld(); final Instance world = player.getInstanceWorld();
if (world != null)
{
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
if (!portraits.isEmpty()) if (!portraits.isEmpty())
{ {
@@ -462,6 +464,7 @@ public class LastImperialTomb extends AbstractInstance
world.setParameter("demons", demons); world.setParameter("demons", demons);
startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false);
} }
}
break; break;
} }
case "PLAY_RANDOM_SONG": case "PLAY_RANDOM_SONG":

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

@@ -446,6 +446,8 @@ public class LastImperialTomb extends AbstractInstance
case "SPAWN_DEMONS": case "SPAWN_DEMONS":
{ {
final Instance world = player.getInstanceWorld(); final Instance world = player.getInstanceWorld();
if (world != null)
{
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
if (!portraits.isEmpty()) if (!portraits.isEmpty())
{ {
@@ -462,6 +464,7 @@ public class LastImperialTomb extends AbstractInstance
world.setParameter("demons", demons); world.setParameter("demons", demons);
startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false);
} }
}
break; break;
} }
case "PLAY_RANDOM_SONG": case "PLAY_RANDOM_SONG":

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

@@ -446,6 +446,8 @@ public class LastImperialTomb extends AbstractInstance
case "SPAWN_DEMONS": case "SPAWN_DEMONS":
{ {
final Instance world = player.getInstanceWorld(); final Instance world = player.getInstanceWorld();
if (world != null)
{
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
if (!portraits.isEmpty()) if (!portraits.isEmpty())
{ {
@@ -462,6 +464,7 @@ public class LastImperialTomb extends AbstractInstance
world.setParameter("demons", demons); world.setParameter("demons", demons);
startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false);
} }
}
break; break;
} }
case "PLAY_RANDOM_SONG": case "PLAY_RANDOM_SONG":

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

@@ -446,6 +446,8 @@ public class LastImperialTomb extends AbstractInstance
case "SPAWN_DEMONS": case "SPAWN_DEMONS":
{ {
final Instance world = player.getInstanceWorld(); final Instance world = player.getInstanceWorld();
if (world != null)
{
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
if (!portraits.isEmpty()) if (!portraits.isEmpty())
{ {
@@ -462,6 +464,7 @@ public class LastImperialTomb extends AbstractInstance
world.setParameter("demons", demons); world.setParameter("demons", demons);
startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false);
} }
}
break; break;
} }
case "PLAY_RANDOM_SONG": case "PLAY_RANDOM_SONG":

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

@@ -446,6 +446,8 @@ public class LastImperialTomb extends AbstractInstance
case "SPAWN_DEMONS": case "SPAWN_DEMONS":
{ {
final Instance world = player.getInstanceWorld(); final Instance world = player.getInstanceWorld();
if (world != null)
{
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
if (!portraits.isEmpty()) if (!portraits.isEmpty())
{ {
@@ -462,6 +464,7 @@ public class LastImperialTomb extends AbstractInstance
world.setParameter("demons", demons); world.setParameter("demons", demons);
startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false);
} }
}
break; break;
} }
case "PLAY_RANDOM_SONG": case "PLAY_RANDOM_SONG":

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

@@ -448,6 +448,8 @@ public class LastImperialTomb extends AbstractInstance
case "SPAWN_DEMONS": case "SPAWN_DEMONS":
{ {
final Instance world = player.getInstanceWorld(); final Instance world = player.getInstanceWorld();
if (world != null)
{
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
if (!portraits.isEmpty()) if (!portraits.isEmpty())
{ {
@@ -464,6 +466,7 @@ public class LastImperialTomb extends AbstractInstance
world.setParameter("demons", demons); world.setParameter("demons", demons);
startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false);
} }
}
break; break;
} }
case "PLAY_RANDOM_SONG": case "PLAY_RANDOM_SONG":

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

@@ -448,6 +448,8 @@ public class LastImperialTomb extends AbstractInstance
case "SPAWN_DEMONS": case "SPAWN_DEMONS":
{ {
final Instance world = player.getInstanceWorld(); final Instance world = player.getInstanceWorld();
if (world != null)
{
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
if (!portraits.isEmpty()) if (!portraits.isEmpty())
{ {
@@ -464,6 +466,7 @@ public class LastImperialTomb extends AbstractInstance
world.setParameter("demons", demons); world.setParameter("demons", demons);
startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false);
} }
}
break; break;
} }
case "PLAY_RANDOM_SONG": case "PLAY_RANDOM_SONG":

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

@@ -446,6 +446,8 @@ public class LastImperialTomb extends AbstractInstance
case "SPAWN_DEMONS": case "SPAWN_DEMONS":
{ {
final Instance world = player.getInstanceWorld(); final Instance world = player.getInstanceWorld();
if (world != null)
{
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
if (!portraits.isEmpty()) if (!portraits.isEmpty())
{ {
@@ -462,6 +464,7 @@ public class LastImperialTomb extends AbstractInstance
world.setParameter("demons", demons); world.setParameter("demons", demons);
startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false); startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false);
} }
}
break; break;
} }
case "PLAY_RANDOM_SONG": case "PLAY_RANDOM_SONG":