From 038ee0ee416fd8fb9e2317b87258dcc26c53762e Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 11 Dec 2022 04:06:45 +0000
Subject: [PATCH] Fixed quest Crossing Fate (10797). Thanks to panther.

---
 .../Q10797_CrossingFate/Q10797_CrossingFate.java       | 10 +++++++---
 .../Q10797_CrossingFate/Q10797_CrossingFate.java       | 10 +++++++---
 .../Q10797_CrossingFate/Q10797_CrossingFate.java       | 10 +++++++---
 .../Q10797_CrossingFate/Q10797_CrossingFate.java       |  2 ++
 .../Q10797_CrossingFate/Q10797_CrossingFate.java       |  2 ++
 .../Q10797_CrossingFate/Q10797_CrossingFate.java       |  2 ++
 .../Q10797_CrossingFate/Q10797_CrossingFate.java       |  2 ++
 7 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
index 23d9fbed41..7d89984145 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
@@ -48,29 +48,32 @@ public class Q10797_CrossingFate extends Quest
 		addTalkId(EYE_OF_ARGOS);
 		addKillId(DAIMON_THE_WHITE_EYED);
 		addCondLevel(MIN_LEVEL, MAX_LEVEL, "no_level.html");
-		addCondRace(Race.ERTHEIA, "noErtheya.html");
+		addCondRace(Race.ERTHEIA, "noErtheia.html");
 		addCondCompletedQuest(Q10796_TheEyeThatDefiedTheGods.class.getSimpleName(), "restriction.html");
 	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)
 	{
+		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
 		{
-			return null;
+			return htmltext;
 		}
-		final String htmltext = event;
+		
 		switch (event)
 		{
 			case "31683-02.htm":
 			case "31683-03.htm":
 			{
+				htmltext = event;
 				break;
 			}
 			case "31683-04.htm":
 			{
 				qs.startQuest();
+				htmltext = event;
 				break;
 			}
 			case "31683-07.html":
@@ -81,6 +84,7 @@ public class Q10797_CrossingFate extends Quest
 					giveStoryQuestReward(player, 26);
 					giveItems(player, EAA, 5);
 					qs.exitQuest(false, true);
+					htmltext = event;
 					break;
 				}
 			}
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
index 23d9fbed41..7d89984145 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
@@ -48,29 +48,32 @@ public class Q10797_CrossingFate extends Quest
 		addTalkId(EYE_OF_ARGOS);
 		addKillId(DAIMON_THE_WHITE_EYED);
 		addCondLevel(MIN_LEVEL, MAX_LEVEL, "no_level.html");
-		addCondRace(Race.ERTHEIA, "noErtheya.html");
+		addCondRace(Race.ERTHEIA, "noErtheia.html");
 		addCondCompletedQuest(Q10796_TheEyeThatDefiedTheGods.class.getSimpleName(), "restriction.html");
 	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)
 	{
+		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
 		{
-			return null;
+			return htmltext;
 		}
-		final String htmltext = event;
+		
 		switch (event)
 		{
 			case "31683-02.htm":
 			case "31683-03.htm":
 			{
+				htmltext = event;
 				break;
 			}
 			case "31683-04.htm":
 			{
 				qs.startQuest();
+				htmltext = event;
 				break;
 			}
 			case "31683-07.html":
@@ -81,6 +84,7 @@ public class Q10797_CrossingFate extends Quest
 					giveStoryQuestReward(player, 26);
 					giveItems(player, EAA, 5);
 					qs.exitQuest(false, true);
+					htmltext = event;
 					break;
 				}
 			}
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
index 23d9fbed41..7d89984145 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
@@ -48,29 +48,32 @@ public class Q10797_CrossingFate extends Quest
 		addTalkId(EYE_OF_ARGOS);
 		addKillId(DAIMON_THE_WHITE_EYED);
 		addCondLevel(MIN_LEVEL, MAX_LEVEL, "no_level.html");
-		addCondRace(Race.ERTHEIA, "noErtheya.html");
+		addCondRace(Race.ERTHEIA, "noErtheia.html");
 		addCondCompletedQuest(Q10796_TheEyeThatDefiedTheGods.class.getSimpleName(), "restriction.html");
 	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)
 	{
+		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
 		{
-			return null;
+			return htmltext;
 		}
-		final String htmltext = event;
+		
 		switch (event)
 		{
 			case "31683-02.htm":
 			case "31683-03.htm":
 			{
+				htmltext = event;
 				break;
 			}
 			case "31683-04.htm":
 			{
 				qs.startQuest();
+				htmltext = event;
 				break;
 			}
 			case "31683-07.html":
@@ -81,6 +84,7 @@ public class Q10797_CrossingFate extends Quest
 					giveStoryQuestReward(player, 26);
 					giveItems(player, EAA, 5);
 					qs.exitQuest(false, true);
+					htmltext = event;
 					break;
 				}
 			}
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
index 878c067522..95fb61323c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
@@ -85,11 +85,13 @@ public class Q10797_CrossingFate extends Quest
 			case "31683-02.htm":
 			case "31683-03.htm":
 			{
+				htmltext = event;
 				break;
 			}
 			case "31683-04.htm":
 			{
 				qs.startQuest();
+				htmltext = event;
 				break;
 			}
 			case "31683-07.html":
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
index 878c067522..95fb61323c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
@@ -85,11 +85,13 @@ public class Q10797_CrossingFate extends Quest
 			case "31683-02.htm":
 			case "31683-03.htm":
 			{
+				htmltext = event;
 				break;
 			}
 			case "31683-04.htm":
 			{
 				qs.startQuest();
+				htmltext = event;
 				break;
 			}
 			case "31683-07.html":
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
index 878c067522..95fb61323c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
@@ -85,11 +85,13 @@ public class Q10797_CrossingFate extends Quest
 			case "31683-02.htm":
 			case "31683-03.htm":
 			{
+				htmltext = event;
 				break;
 			}
 			case "31683-04.htm":
 			{
 				qs.startQuest();
+				htmltext = event;
 				break;
 			}
 			case "31683-07.html":
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
index 878c067522..95fb61323c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
@@ -85,11 +85,13 @@ public class Q10797_CrossingFate extends Quest
 			case "31683-02.htm":
 			case "31683-03.htm":
 			{
+				htmltext = event;
 				break;
 			}
 			case "31683-04.htm":
 			{
 				qs.startQuest();
+				htmltext = event;
 				break;
 			}
 			case "31683-07.html":