From c9648c50ad7c64ac57de3bf609fd4062eaf5eaee Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 8 Jul 2020 09:28:13 +0000
Subject: [PATCH] Proper previous quest condition for Into the Large Cavern
 (179). Contributed by Helionar.

---
 .../Q00179_IntoTheLargeCavern.java                       | 9 +++++++--
 .../Q00179_IntoTheLargeCavern.java                       | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java
index 5f81d9120e..931fd818ea 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java
@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
 
+import quests.Q00178_IconicTrinity.Q00178_IconicTrinity;
+
 /**
  * Into the Large Cavern (179)
  * @author Gnacik
@@ -33,6 +35,9 @@ public class Q00179_IntoTheLargeCavern extends Quest
 	// NPCs
 	private static final int KEKROPUS = 32138;
 	private static final int MENACING_MACHINE = 32258;
+	// Misc
+	private static final int MIN_LEVEL = 17;
+	private static final int MAX_LEVEL = 21;
 	
 	public Q00179_IntoTheLargeCavern()
 	{
@@ -94,9 +99,9 @@ public class Q00179_IntoTheLargeCavern extends Quest
 					}
 					else
 					{
-						final QuestState prev = player.getQuestState("178_IconicTrinity");
+						final QuestState prev = player.getQuestState(Q00178_IconicTrinity.class.getSimpleName());
 						final int level = player.getLevel();
-						if ((prev != null) && prev.isCompleted() && (level >= 17) && (level <= 21) && (player.getClassId().level() == 0))
+						if ((prev != null) && prev.isCompleted() && (level >= MIN_LEVEL) && (level <= MAX_LEVEL) && (player.getClassId().level() == 0))
 						{
 							htmltext = "32138-01.htm";
 						}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java
index 5f81d9120e..931fd818ea 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java
@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;
 
+import quests.Q00178_IconicTrinity.Q00178_IconicTrinity;
+
 /**
  * Into the Large Cavern (179)
  * @author Gnacik
@@ -33,6 +35,9 @@ public class Q00179_IntoTheLargeCavern extends Quest
 	// NPCs
 	private static final int KEKROPUS = 32138;
 	private static final int MENACING_MACHINE = 32258;
+	// Misc
+	private static final int MIN_LEVEL = 17;
+	private static final int MAX_LEVEL = 21;
 	
 	public Q00179_IntoTheLargeCavern()
 	{
@@ -94,9 +99,9 @@ public class Q00179_IntoTheLargeCavern extends Quest
 					}
 					else
 					{
-						final QuestState prev = player.getQuestState("178_IconicTrinity");
+						final QuestState prev = player.getQuestState(Q00178_IconicTrinity.class.getSimpleName());
 						final int level = player.getLevel();
-						if ((prev != null) && prev.isCompleted() && (level >= 17) && (level <= 21) && (player.getClassId().level() == 0))
+						if ((prev != null) && prev.isCompleted() && (level >= MIN_LEVEL) && (level <= MAX_LEVEL) && (player.getClassId().level() == 0))
 						{
 							htmltext = "32138-01.htm";
 						}