From c49f79859d70dae5c79e435d57deaae24e592e09 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 10 Dec 2022 18:25:25 +0000 Subject: [PATCH] Fixed quest The Eye that Defied the Gods (10796). Thanks to panther. --- .../Q10796_TheEyeThatDefiedTheGods.java | 10 +++++++--- .../Q10796_TheEyeThatDefiedTheGods.java | 10 +++++++--- .../Q10796_TheEyeThatDefiedTheGods.java | 2 ++ .../Q10796_TheEyeThatDefiedTheGods.java | 2 ++ .../Q10796_TheEyeThatDefiedTheGods.java | 2 ++ .../Q10796_TheEyeThatDefiedTheGods.java | 2 ++ .../Q10796_TheEyeThatDefiedTheGods.java | 2 ++ 7 files changed, 24 insertions(+), 6 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java index 4c9a7ab320..143abbad30 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java @@ -44,28 +44,31 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest addStartNpc(HERMIT); addTalkId(HERMIT, EYE_OF_ARGOS); addCondLevel(MIN_LEVEL, MAX_LEVEL, "no_level.html"); - addCondRace(Race.ERTHEIA, "noErtheya.html"); + addCondRace(Race.ERTHEIA, "noErtheia.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 "31616-02.htm": case "31616-03.htm": { + htmltext = event; break; } case "31616-04.htm": { qs.startQuest(); + htmltext = event; break; } case "31683-02.html": @@ -74,6 +77,7 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest giveStoryQuestReward(player, 2); giveItems(player, EAA, 2); qs.exitQuest(false, true); + htmltext = event; break; } } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java index 4c9a7ab320..143abbad30 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java @@ -44,28 +44,31 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest addStartNpc(HERMIT); addTalkId(HERMIT, EYE_OF_ARGOS); addCondLevel(MIN_LEVEL, MAX_LEVEL, "no_level.html"); - addCondRace(Race.ERTHEIA, "noErtheya.html"); + addCondRace(Race.ERTHEIA, "noErtheia.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 "31616-02.htm": case "31616-03.htm": { + htmltext = event; break; } case "31616-04.htm": { qs.startQuest(); + htmltext = event; break; } case "31683-02.html": @@ -74,6 +77,7 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest giveStoryQuestReward(player, 2); giveItems(player, EAA, 2); qs.exitQuest(false, true); + htmltext = event; break; } } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java index 1f32aeb20a..249b0ee4dd 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java @@ -82,11 +82,13 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest case "31616-02.htm": case "31616-03.htm": { + htmltext = event; break; } case "31616-04.htm": { qs.startQuest(); + htmltext = event; break; } case "31683-02.html": diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java index 7085e2c9a5..26b6a34591 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java @@ -80,11 +80,13 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest case "31616-02.htm": case "31616-03.htm": { + htmltext = event; break; } case "31616-04.htm": { qs.startQuest(); + htmltext = event; break; } case "31683-02.html": diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java index 7085e2c9a5..26b6a34591 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java @@ -80,11 +80,13 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest case "31616-02.htm": case "31616-03.htm": { + htmltext = event; break; } case "31616-04.htm": { qs.startQuest(); + htmltext = event; break; } case "31683-02.html": diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java index 7085e2c9a5..26b6a34591 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java @@ -80,11 +80,13 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest case "31616-02.htm": case "31616-03.htm": { + htmltext = event; break; } case "31616-04.htm": { qs.startQuest(); + htmltext = event; break; } case "31683-02.html": diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java index 7085e2c9a5..26b6a34591 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java @@ -80,11 +80,13 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest case "31616-02.htm": case "31616-03.htm": { + htmltext = event; break; } case "31616-04.htm": { qs.startQuest(); + htmltext = event; break; } case "31683-02.html":