Chamber of Prophecies NPE prevention.

This commit is contained in:
MobiusDevelopment
2020-01-19 22:07:53 +00:00
parent a5748daa84
commit 7f69fd2999
8 changed files with 16 additions and 16 deletions

View File

@@ -86,7 +86,7 @@ public class ChamberOfProphecies extends AbstractInstance
qs.setCond(16, true); qs.setCond(16, true);
} }
} }
else else if (npc != null)
{ {
final Instance world = npc.getInstanceWorld(); final Instance world = npc.getInstanceWorld();
if (!isInInstance(world)) if (!isInInstance(world))
@@ -106,7 +106,7 @@ public class ChamberOfProphecies extends AbstractInstance
} }
case "33996-02.html": case "33996-02.html":
{ {
world.broadcastPacket(ExShowUsm.USM_Q015_E); // TODO not show usim movie world.broadcastPacket(ExShowUsm.USM_Q015_E);
world.despawnGroup("q10753_16_instance_grail"); world.despawnGroup("q10753_16_instance_grail");
world.spawnGroup("q10753_16_instance_wizard"); world.spawnGroup("q10753_16_instance_wizard");
giveItems(player, ATELIA, 1); giveItems(player, ATELIA, 1);

View File

@@ -86,7 +86,7 @@ public class ChamberOfProphecies extends AbstractInstance
qs.setCond(16, true); qs.setCond(16, true);
} }
} }
else else if (npc != null)
{ {
final Instance world = npc.getInstanceWorld(); final Instance world = npc.getInstanceWorld();
if (!isInInstance(world)) if (!isInInstance(world))
@@ -106,7 +106,7 @@ public class ChamberOfProphecies extends AbstractInstance
} }
case "33996-02.html": case "33996-02.html":
{ {
world.broadcastPacket(ExShowUsm.USM_Q015_E); // TODO not show usim movie world.broadcastPacket(ExShowUsm.USM_Q015_E);
world.despawnGroup("q10753_16_instance_grail"); world.despawnGroup("q10753_16_instance_grail");
world.spawnGroup("q10753_16_instance_wizard"); world.spawnGroup("q10753_16_instance_wizard");
giveItems(player, ATELIA, 1); giveItems(player, ATELIA, 1);

View File

@@ -86,7 +86,7 @@ public class ChamberOfProphecies extends AbstractInstance
qs.setCond(16, true); qs.setCond(16, true);
} }
} }
else else if (npc != null)
{ {
final Instance world = npc.getInstanceWorld(); final Instance world = npc.getInstanceWorld();
if (!isInInstance(world)) if (!isInInstance(world))
@@ -106,7 +106,7 @@ public class ChamberOfProphecies extends AbstractInstance
} }
case "33996-02.html": case "33996-02.html":
{ {
world.broadcastPacket(ExShowUsm.USM_Q015_E); // TODO not show usim movie world.broadcastPacket(ExShowUsm.USM_Q015_E);
world.despawnGroup("q10753_16_instance_grail"); world.despawnGroup("q10753_16_instance_grail");
world.spawnGroup("q10753_16_instance_wizard"); world.spawnGroup("q10753_16_instance_wizard");
giveItems(player, ATELIA, 1); giveItems(player, ATELIA, 1);

View File

@@ -86,7 +86,7 @@ public class ChamberOfProphecies extends AbstractInstance
qs.setCond(16, true); qs.setCond(16, true);
} }
} }
else else if (npc != null)
{ {
final Instance world = npc.getInstanceWorld(); final Instance world = npc.getInstanceWorld();
if (!isInInstance(world)) if (!isInInstance(world))
@@ -106,7 +106,7 @@ public class ChamberOfProphecies extends AbstractInstance
} }
case "33996-02.html": case "33996-02.html":
{ {
world.broadcastPacket(ExShowUsm.USM_Q015_E); // TODO not show usim movie world.broadcastPacket(ExShowUsm.USM_Q015_E);
world.despawnGroup("q10753_16_instance_grail"); world.despawnGroup("q10753_16_instance_grail");
world.spawnGroup("q10753_16_instance_wizard"); world.spawnGroup("q10753_16_instance_wizard");
giveItems(player, ATELIA, 1); giveItems(player, ATELIA, 1);

View File

@@ -86,7 +86,7 @@ public class ChamberOfProphecies extends AbstractInstance
qs.setCond(16, true); qs.setCond(16, true);
} }
} }
else else if (npc != null)
{ {
final Instance world = npc.getInstanceWorld(); final Instance world = npc.getInstanceWorld();
if (!isInInstance(world)) if (!isInInstance(world))
@@ -106,7 +106,7 @@ public class ChamberOfProphecies extends AbstractInstance
} }
case "33996-02.html": case "33996-02.html":
{ {
world.broadcastPacket(ExShowUsm.USM_Q015_E); // TODO not show usim movie world.broadcastPacket(ExShowUsm.USM_Q015_E);
world.despawnGroup("q10753_16_instance_grail"); world.despawnGroup("q10753_16_instance_grail");
world.spawnGroup("q10753_16_instance_wizard"); world.spawnGroup("q10753_16_instance_wizard");
giveItems(player, ATELIA, 1); giveItems(player, ATELIA, 1);

View File

@@ -86,7 +86,7 @@ public class ChamberOfProphecies extends AbstractInstance
qs.setCond(16, true); qs.setCond(16, true);
} }
} }
else else if (npc != null)
{ {
final Instance world = npc.getInstanceWorld(); final Instance world = npc.getInstanceWorld();
if (!isInInstance(world)) if (!isInInstance(world))
@@ -106,7 +106,7 @@ public class ChamberOfProphecies extends AbstractInstance
} }
case "33996-02.html": case "33996-02.html":
{ {
world.broadcastPacket(ExShowUsm.USM_Q015_E); // TODO not show usim movie world.broadcastPacket(ExShowUsm.USM_Q015_E);
world.despawnGroup("q10753_16_instance_grail"); world.despawnGroup("q10753_16_instance_grail");
world.spawnGroup("q10753_16_instance_wizard"); world.spawnGroup("q10753_16_instance_wizard");
giveItems(player, ATELIA, 1); giveItems(player, ATELIA, 1);

View File

@@ -86,7 +86,7 @@ public class ChamberOfProphecies extends AbstractInstance
qs.setCond(16, true); qs.setCond(16, true);
} }
} }
else else if (npc != null)
{ {
final Instance world = npc.getInstanceWorld(); final Instance world = npc.getInstanceWorld();
if (!isInInstance(world)) if (!isInInstance(world))
@@ -106,7 +106,7 @@ public class ChamberOfProphecies extends AbstractInstance
} }
case "33996-02.html": case "33996-02.html":
{ {
world.broadcastPacket(ExShowUsm.USM_Q015_E); // TODO not show usim movie world.broadcastPacket(ExShowUsm.USM_Q015_E);
world.despawnGroup("q10753_16_instance_grail"); world.despawnGroup("q10753_16_instance_grail");
world.spawnGroup("q10753_16_instance_wizard"); world.spawnGroup("q10753_16_instance_wizard");
giveItems(player, ATELIA, 1); giveItems(player, ATELIA, 1);

View File

@@ -86,7 +86,7 @@ public class ChamberOfProphecies extends AbstractInstance
qs.setCond(4, true); qs.setCond(4, true);
} }
} }
else else if (npc != null)
{ {
final Instance world = npc.getInstanceWorld(); final Instance world = npc.getInstanceWorld();
if (!isInInstance(world)) if (!isInInstance(world))
@@ -106,7 +106,7 @@ public class ChamberOfProphecies extends AbstractInstance
} }
case "33996-02.html": case "33996-02.html":
{ {
world.broadcastPacket(ExShowUsm.USM_Q015_E); // TODO not show usim movie world.broadcastPacket(ExShowUsm.USM_Q015_E);
world.despawnGroup("q10753_16_instance_grail"); world.despawnGroup("q10753_16_instance_grail");
world.spawnGroup("q10753_16_instance_wizard"); world.spawnGroup("q10753_16_instance_wizard");
giveItems(player, ATELIA, 1); giveItems(player, ATELIA, 1);