Fixed Chamber of Prophecies grail NPE.

This commit is contained in:
MobiusDevelopment 2020-01-30 12:16:02 +00:00
parent 99c209f0ba
commit 178f692d47
8 changed files with 24 additions and 16 deletions

View File

@ -352,12 +352,13 @@ public class ChamberOfProphecies extends AbstractInstance
world.openCloseDoor(DOOR_4, true);
cancelQuestTimers("ATTACK2");
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, player);
startQuestTimer("CLOSE", 15000, world.getNpc(GRAIL), player);
startQuestTimer("CLOSE", 15000, null, player);
break;
}
case "CLOSE":
{
if (player.calculateDistance2D(world.getNpc(GRAIL)) < 390)
final Npc grail = world.getNpc(GRAIL);
if ((grail != null) && (player.calculateDistance2D(grail) < 390))
{
world.openCloseDoor(DOOR_4, false);
world.despawnGroup("q10753_16_instance_halter_1_1");

View File

@ -352,12 +352,13 @@ public class ChamberOfProphecies extends AbstractInstance
world.openCloseDoor(DOOR_4, true);
cancelQuestTimers("ATTACK2");
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, player);
startQuestTimer("CLOSE", 15000, world.getNpc(GRAIL), player);
startQuestTimer("CLOSE", 15000, null, player);
break;
}
case "CLOSE":
{
if (player.calculateDistance2D(world.getNpc(GRAIL)) < 390)
final Npc grail = world.getNpc(GRAIL);
if ((grail != null) && (player.calculateDistance2D(grail) < 390))
{
world.openCloseDoor(DOOR_4, false);
world.despawnGroup("q10753_16_instance_halter_1_1");

View File

@ -352,12 +352,13 @@ public class ChamberOfProphecies extends AbstractInstance
world.openCloseDoor(DOOR_4, true);
cancelQuestTimers("ATTACK2");
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, player);
startQuestTimer("CLOSE", 15000, world.getNpc(GRAIL), player);
startQuestTimer("CLOSE", 15000, null, player);
break;
}
case "CLOSE":
{
if (player.calculateDistance2D(world.getNpc(GRAIL)) < 390)
final Npc grail = world.getNpc(GRAIL);
if ((grail != null) && (player.calculateDistance2D(grail) < 390))
{
world.openCloseDoor(DOOR_4, false);
world.despawnGroup("q10753_16_instance_halter_1_1");

View File

@ -352,12 +352,13 @@ public class ChamberOfProphecies extends AbstractInstance
world.openCloseDoor(DOOR_4, true);
cancelQuestTimers("ATTACK2");
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, player);
startQuestTimer("CLOSE", 15000, world.getNpc(GRAIL), player);
startQuestTimer("CLOSE", 15000, null, player);
break;
}
case "CLOSE":
{
if (player.calculateDistance2D(world.getNpc(GRAIL)) < 390)
final Npc grail = world.getNpc(GRAIL);
if ((grail != null) && (player.calculateDistance2D(grail) < 390))
{
world.openCloseDoor(DOOR_4, false);
world.despawnGroup("q10753_16_instance_halter_1_1");

View File

@ -352,12 +352,13 @@ public class ChamberOfProphecies extends AbstractInstance
world.openCloseDoor(DOOR_4, true);
cancelQuestTimers("ATTACK2");
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, player);
startQuestTimer("CLOSE", 15000, world.getNpc(GRAIL), player);
startQuestTimer("CLOSE", 15000, null, player);
break;
}
case "CLOSE":
{
if (player.calculateDistance2D(world.getNpc(GRAIL)) < 390)
final Npc grail = world.getNpc(GRAIL);
if ((grail != null) && (player.calculateDistance2D(grail) < 390))
{
world.openCloseDoor(DOOR_4, false);
world.despawnGroup("q10753_16_instance_halter_1_1");

View File

@ -352,12 +352,13 @@ public class ChamberOfProphecies extends AbstractInstance
world.openCloseDoor(DOOR_4, true);
cancelQuestTimers("ATTACK2");
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, player);
startQuestTimer("CLOSE", 15000, world.getNpc(GRAIL), player);
startQuestTimer("CLOSE", 15000, null, player);
break;
}
case "CLOSE":
{
if (player.calculateDistance2D(world.getNpc(GRAIL)) < 390)
final Npc grail = world.getNpc(GRAIL);
if ((grail != null) && (player.calculateDistance2D(grail) < 390))
{
world.openCloseDoor(DOOR_4, false);
world.despawnGroup("q10753_16_instance_halter_1_1");

View File

@ -352,12 +352,13 @@ public class ChamberOfProphecies extends AbstractInstance
world.openCloseDoor(DOOR_4, true);
cancelQuestTimers("ATTACK2");
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, player);
startQuestTimer("CLOSE", 15000, world.getNpc(GRAIL), player);
startQuestTimer("CLOSE", 15000, null, player);
break;
}
case "CLOSE":
{
if (player.calculateDistance2D(world.getNpc(GRAIL)) < 390)
final Npc grail = world.getNpc(GRAIL);
if ((grail != null) && (player.calculateDistance2D(grail) < 390))
{
world.openCloseDoor(DOOR_4, false);
world.despawnGroup("q10753_16_instance_halter_1_1");

View File

@ -352,12 +352,13 @@ public class ChamberOfProphecies extends AbstractInstance
world.openCloseDoor(DOOR_4, true);
cancelQuestTimers("ATTACK2");
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, player);
startQuestTimer("CLOSE", 15000, world.getNpc(GRAIL), player);
startQuestTimer("CLOSE", 15000, null, player);
break;
}
case "CLOSE":
{
if (player.calculateDistance2D(world.getNpc(GRAIL)) < 390)
final Npc grail = world.getNpc(GRAIL);
if ((grail != null) && (player.calculateDistance2D(grail) < 390))
{
world.openCloseDoor(DOOR_4, false);
world.despawnGroup("q10753_16_instance_halter_1_1");