From 4cae5898ba640d38ba0e1a94ff622296a1f9952f Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 7 Jul 2018 18:59:19 +0000
Subject: [PATCH] ChamberOfProphecies timers should always check for npc value.

---
 .../instances/ChamberOfProphecies/ChamberOfProphecies.java    | 4 ++--
 .../instances/ChamberOfProphecies/ChamberOfProphecies.java    | 4 ++--
 .../instances/ChamberOfProphecies/ChamberOfProphecies.java    | 4 ++--
 .../instances/ChamberOfProphecies/ChamberOfProphecies.java    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index 52994fb214..c3cb96ae93 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -352,7 +352,7 @@ public final class ChamberOfProphecies extends AbstractInstance
 					world.openCloseDoor(DOOR_4, true);
 					cancelQuestTimers("ATTACK2");
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, player);
-					startQuestTimer("CLOSE", 15000, null, player);
+					startQuestTimer("CLOSE", 15000, world.getNpc(GRAIL), player);
 					break;
 				}
 				case "CLOSE":
@@ -365,7 +365,7 @@ public final class ChamberOfProphecies extends AbstractInstance
 					}
 					else
 					{
-						startQuestTimer("CLOSE", 3000, null, player);
+						startQuestTimer("CLOSE", 3000, npc, player);
 					}
 					break;
 				}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index 52994fb214..c3cb96ae93 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -352,7 +352,7 @@ public final class ChamberOfProphecies extends AbstractInstance
 					world.openCloseDoor(DOOR_4, true);
 					cancelQuestTimers("ATTACK2");
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, player);
-					startQuestTimer("CLOSE", 15000, null, player);
+					startQuestTimer("CLOSE", 15000, world.getNpc(GRAIL), player);
 					break;
 				}
 				case "CLOSE":
@@ -365,7 +365,7 @@ public final class ChamberOfProphecies extends AbstractInstance
 					}
 					else
 					{
-						startQuestTimer("CLOSE", 3000, null, player);
+						startQuestTimer("CLOSE", 3000, npc, player);
 					}
 					break;
 				}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index 52994fb214..c3cb96ae93 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -352,7 +352,7 @@ public final class ChamberOfProphecies extends AbstractInstance
 					world.openCloseDoor(DOOR_4, true);
 					cancelQuestTimers("ATTACK2");
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, player);
-					startQuestTimer("CLOSE", 15000, null, player);
+					startQuestTimer("CLOSE", 15000, world.getNpc(GRAIL), player);
 					break;
 				}
 				case "CLOSE":
@@ -365,7 +365,7 @@ public final class ChamberOfProphecies extends AbstractInstance
 					}
 					else
 					{
-						startQuestTimer("CLOSE", 3000, null, player);
+						startQuestTimer("CLOSE", 3000, npc, player);
 					}
 					break;
 				}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index 52994fb214..c3cb96ae93 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -352,7 +352,7 @@ public final class ChamberOfProphecies extends AbstractInstance
 					world.openCloseDoor(DOOR_4, true);
 					cancelQuestTimers("ATTACK2");
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, player);
-					startQuestTimer("CLOSE", 15000, null, player);
+					startQuestTimer("CLOSE", 15000, world.getNpc(GRAIL), player);
 					break;
 				}
 				case "CLOSE":
@@ -365,7 +365,7 @@ public final class ChamberOfProphecies extends AbstractInstance
 					}
 					else
 					{
-						startQuestTimer("CLOSE", 3000, null, player);
+						startQuestTimer("CLOSE", 3000, npc, player);
 					}
 					break;
 				}