Prevent NPE when spawning demons.

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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