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

Fixed Chamber of Prophecies grail NPE.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java vendored
View File

@ -352,12 +352,13 @@ public class ChamberOfProphecies extends AbstractInstance
world.openCloseDoor(DOOR_4, true); world.openCloseDoor(DOOR_4, true);
cancelQuestTimers("ATTACK2"); cancelQuestTimers("ATTACK2");
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, player); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, player);
startQuestTimer("CLOSE", 15000, world.getNpc(GRAIL), player); startQuestTimer("CLOSE", 15000, null, player);
break; break;
} }
case "CLOSE": 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.openCloseDoor(DOOR_4, false);
world.despawnGroup("q10753_16_instance_halter_1_1"); world.despawnGroup("q10753_16_instance_halter_1_1");

5
L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java vendored
View File

@ -352,12 +352,13 @@ public class ChamberOfProphecies extends AbstractInstance
world.openCloseDoor(DOOR_4, true); world.openCloseDoor(DOOR_4, true);
cancelQuestTimers("ATTACK2"); cancelQuestTimers("ATTACK2");
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, player); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, player);
startQuestTimer("CLOSE", 15000, world.getNpc(GRAIL), player); startQuestTimer("CLOSE", 15000, null, player);
break; break;
} }
case "CLOSE": 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.openCloseDoor(DOOR_4, false);
world.despawnGroup("q10753_16_instance_halter_1_1"); world.despawnGroup("q10753_16_instance_halter_1_1");

5
L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java vendored
View File

@ -352,12 +352,13 @@ public class ChamberOfProphecies extends AbstractInstance
world.openCloseDoor(DOOR_4, true); world.openCloseDoor(DOOR_4, true);
cancelQuestTimers("ATTACK2"); cancelQuestTimers("ATTACK2");
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, player); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, player);
startQuestTimer("CLOSE", 15000, world.getNpc(GRAIL), player); startQuestTimer("CLOSE", 15000, null, player);
break; break;
} }
case "CLOSE": 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.openCloseDoor(DOOR_4, false);
world.despawnGroup("q10753_16_instance_halter_1_1"); world.despawnGroup("q10753_16_instance_halter_1_1");

5
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java vendored
View File

@ -352,12 +352,13 @@ public class ChamberOfProphecies extends AbstractInstance
world.openCloseDoor(DOOR_4, true); world.openCloseDoor(DOOR_4, true);
cancelQuestTimers("ATTACK2"); cancelQuestTimers("ATTACK2");
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, player); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, player);
startQuestTimer("CLOSE", 15000, world.getNpc(GRAIL), player); startQuestTimer("CLOSE", 15000, null, player);
break; break;
} }
case "CLOSE": 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.openCloseDoor(DOOR_4, false);
world.despawnGroup("q10753_16_instance_halter_1_1"); world.despawnGroup("q10753_16_instance_halter_1_1");

5
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java vendored
View File

@ -352,12 +352,13 @@ public class ChamberOfProphecies extends AbstractInstance
world.openCloseDoor(DOOR_4, true); world.openCloseDoor(DOOR_4, true);
cancelQuestTimers("ATTACK2"); cancelQuestTimers("ATTACK2");
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, player); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, player);
startQuestTimer("CLOSE", 15000, world.getNpc(GRAIL), player); startQuestTimer("CLOSE", 15000, null, player);
break; break;
} }
case "CLOSE": 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.openCloseDoor(DOOR_4, false);
world.despawnGroup("q10753_16_instance_halter_1_1"); world.despawnGroup("q10753_16_instance_halter_1_1");

5
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java vendored
View File

@ -352,12 +352,13 @@ public class ChamberOfProphecies extends AbstractInstance
world.openCloseDoor(DOOR_4, true); world.openCloseDoor(DOOR_4, true);
cancelQuestTimers("ATTACK2"); cancelQuestTimers("ATTACK2");
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, player); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, player);
startQuestTimer("CLOSE", 15000, world.getNpc(GRAIL), player); startQuestTimer("CLOSE", 15000, null, player);
break; break;
} }
case "CLOSE": 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.openCloseDoor(DOOR_4, false);
world.despawnGroup("q10753_16_instance_halter_1_1"); world.despawnGroup("q10753_16_instance_halter_1_1");

5
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java vendored
View File

@ -352,12 +352,13 @@ public class ChamberOfProphecies extends AbstractInstance
world.openCloseDoor(DOOR_4, true); world.openCloseDoor(DOOR_4, true);
cancelQuestTimers("ATTACK2"); cancelQuestTimers("ATTACK2");
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, player); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, player);
startQuestTimer("CLOSE", 15000, world.getNpc(GRAIL), player); startQuestTimer("CLOSE", 15000, null, player);
break; break;
} }
case "CLOSE": 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.openCloseDoor(DOOR_4, false);
world.despawnGroup("q10753_16_instance_halter_1_1"); world.despawnGroup("q10753_16_instance_halter_1_1");

5
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java vendored
View File

@ -352,12 +352,13 @@ public class ChamberOfProphecies extends AbstractInstance
world.openCloseDoor(DOOR_4, true); world.openCloseDoor(DOOR_4, true);
cancelQuestTimers("ATTACK2"); cancelQuestTimers("ATTACK2");
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, player); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, player);
startQuestTimer("CLOSE", 15000, world.getNpc(GRAIL), player); startQuestTimer("CLOSE", 15000, null, player);
break; break;
} }
case "CLOSE": 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.openCloseDoor(DOOR_4, false);
world.despawnGroup("q10753_16_instance_halter_1_1"); world.despawnGroup("q10753_16_instance_halter_1_1");