diff --git a/L2J_DataPack/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_DataPack/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
index 65cf50338261a9c8d95694bec865ddeebcf0d6b5..639b9dc81a8861e3656b6c5bd358d4888c306ac1 100644
--- a/L2J_DataPack/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
+++ b/L2J_DataPack/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
@@ -18,23 +18,23 @@
*/
package handlers.bypasshandlers;
+import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import java.util.logging.Level;
-import javolution.util.FastList;
-
-import com.l2jserver.Config;
-import com.l2jserver.gameserver.cache.HtmCache;
+import com.l2jserver.gameserver.datatables.NpcData;
import com.l2jserver.gameserver.handler.IBypassHandler;
import com.l2jserver.gameserver.instancemanager.QuestManager;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
import com.l2jserver.gameserver.model.events.EventType;
import com.l2jserver.gameserver.model.events.listeners.AbstractEventListener;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -89,37 +89,49 @@ public class QuestLink implements IBypassHandler
{
final StringBuilder sb = StringUtil.startAppend(150, "<html><body>");
String state = "";
+ String color = "";
int questId = -1;
- for (Quest q : quests)
+ for (Quest quest : quests)
{
- if (q == null)
+ if (quest == null)
{
continue;
}
- StringUtil.append(sb, "<a action=\"bypass -h npc_", String.valueOf(npc.getObjectId()), "_Quest ", q.getName(), "\">[");
- final QuestState qs = player.getQuestState(q.getScriptName());
+ final QuestState qs = player.getQuestState(quest.getScriptName());
if ((qs == null) || qs.isCreated())
{
- state = q.isCustomQuest() ? "" : "01";
+ state = quest.isCustomQuest() ? "" : "01";
+ if (quest.canStartQuest(player))
+ {
+ color = "bbaa88";
+ }
+ else
+ {
+ color = "a62f31";
+ }
}
else if (qs.isStarted())
{
- state = q.isCustomQuest() ? " (In Progress)" : "02";
+ state = quest.isCustomQuest() ? " (In Progress)" : "02";
+ color = "ffdd66";
}
else if (qs.isCompleted())
{
- state = q.isCustomQuest() ? " (Done)" : "03";
+ state = quest.isCustomQuest() ? " (Done)" : "03";
+ color = "787878";
}
+ StringUtil.append(sb, "<a action=\"bypass -h npc_", String.valueOf(npc.getObjectId()), "_Quest ", quest.getName(), "\">[");
+ StringUtil.append(sb, "<font color=\"" + color + "\">");
- if (q.isCustomQuest())
+ if (quest.isCustomQuest())
{
- StringUtil.append(sb, q.getDescr(), state);
+ StringUtil.append(sb, quest.getDescr(), state);
}
else
{
- questId = q.getId();
- if (q.getId() > 10000)
+ questId = quest.getId();
+ if (quest.getId() > 10000)
{
questId -= 5000;
}
@@ -129,7 +141,7 @@ public class QuestLink implements IBypassHandler
}
StringUtil.append(sb, "<fstring>", String.valueOf(questId), state, "</fstring>");
}
- sb.append("]</a><br>");
+ sb.append("]</font></a><br>");
}
sb.append("</body></html>");
@@ -153,10 +165,10 @@ public class QuestLink implements IBypassHandler
{
String content = null;
- Quest q = QuestManager.getInstance().getQuest(questId);
+ final Quest q = QuestManager.getInstance().getQuest(questId);
// Get the state of the selected quest
- QuestState qs = player.getQuestState(questId);
+ final QuestState qs = player.getQuestState(questId);
if (q != null)
{
@@ -179,52 +191,15 @@ public class QuestLink implements IBypassHandler
return;
}
}
- // check for start point
- for (AbstractEventListener listener : npc.getListeners(EventType.ON_NPC_QUEST_START))
- {
- if (listener.getOwner() instanceof Quest)
- {
- final Quest quest = (Quest) listener.getOwner();
- if (quest == q)
- {
- qs = q.newQuestState(player);
- break;
- }
- }
- }
}
+
+ q.notifyTalk(npc, player);
}
else
{
content = Quest.getNoQuestMsg(player); // no quests found
}
- if ((q != null) && (qs != null))
- {
- // If the quest is already started, no need to show a window
- if (!q.notifyTalk(npc, player))
- {
- return;
- }
-
- questId = q.getName();
- String stateId = State.getStateName(qs.getState());
- String path = "data/scripts/quests/" + questId + "/" + stateId + ".htm";
- content = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), path); // TODO path for quests html
-
- if (Config.DEBUG)
- {
- if (content != null)
- {
- _log.fine("Showing quest window for quest " + questId + " html path: " + path);
- }
- else
- {
- _log.fine("File not exists for quest " + questId + " html path: " + path);
- }
- }
- }
-
// Send a Server->Client packet NpcHtmlMessage to the L2PcInstance in order to display the message of the L2NpcInstance
if (content != null)
{
@@ -235,6 +210,43 @@ public class QuestLink implements IBypassHandler
player.sendPacket(ActionFailed.STATIC_PACKET);
}
+ /**
+ * @param player
+ * @param npcId The Identifier of the NPC
+ * @return a table containing all QuestState from the table _quests in which the L2PcInstance must talk to the NPC.
+ */
+ private static List<QuestState> getQuestsForTalk(final L2PcInstance player, int npcId)
+ {
+ // Create a QuestState table that will contain all QuestState to modify
+ final List<QuestState> states = new ArrayList<>();
+
+ final L2NpcTemplate template = NpcData.getInstance().getTemplate(npcId);
+ if (template == null)
+ {
+ _log.log(Level.WARNING, QuestLink.class.getSimpleName() + ": " + player.getName() + " requested quests for talk on non existing npc " + npcId);
+ return states;
+ }
+
+ // Go through the QuestState of the L2PcInstance quests
+ for (AbstractEventListener listener : template.getListeners(EventType.ON_NPC_TALK))
+ {
+ if (listener.getOwner() instanceof Quest)
+ {
+ final Quest quest = (Quest) listener.getOwner();
+
+ // Copy the current L2PcInstance QuestState in the QuestState table
+ final QuestState st = player.getQuestState(quest.getName());
+ if (st != null)
+ {
+ states.add(st);
+ }
+ }
+ }
+
+ // Return a table containing all QuestState to modify
+ return states;
+ }
+
/**
* Collect awaiting quests/start points and display a QuestChooseWindow (if several available) or QuestWindow.
* @param player the L2PcInstance that talk with the {@code npc}.
@@ -242,28 +254,26 @@ public class QuestLink implements IBypassHandler
*/
public static void showQuestWindow(L2PcInstance player, L2Npc npc)
{
+ boolean conditionMeet = false;
// collect awaiting quests and start points
- List<Quest> options = new FastList<>();
-
- QuestState[] awaits = player.getQuestsForTalk(npc.getTemplate().getId());
+ final Set<Quest> options = new HashSet<>();
// Quests are limited between 1 and 999 because those are the quests that are supported by the client.
// By limiting them there, we are allowed to create custom quests at higher IDs without interfering
- if (awaits != null)
+ for (QuestState state : getQuestsForTalk(player, npc.getId()))
{
- for (QuestState state : awaits)
+ final Quest quest = state.getQuest();
+ if (quest == null)
{
- if (state.getQuest() == null)
- {
- _log.log(Level.WARNING, player + " Requested incorrect quest state for non existing quest: " + state.getQuestName());
- continue;
- }
- if (!options.contains(state.getQuest()))
+ _log.log(Level.WARNING, player + " Requested incorrect quest state for non existing quest: " + state.getQuestName());
+ continue;
+ }
+ if ((quest.getId() > 0) && (quest.getId() < 20000))
+ {
+ options.add(quest);
+ if (quest.canStartQuest(player))
{
- if ((state.getQuest().getId() > 0) && (state.getQuest().getId() < 20000))
- {
- options.add(state.getQuest());
- }
+ conditionMeet = true;
}
}
}
@@ -273,21 +283,28 @@ public class QuestLink implements IBypassHandler
if (listener.getOwner() instanceof Quest)
{
final Quest quest = (Quest) listener.getOwner();
- if (!options.contains(quest) && (quest.getId() > 0) && (quest.getId() < 20000))
+ if ((quest.getId() > 0) && (quest.getId() < 20000))
{
options.add(quest);
+ if (quest.canStartQuest(player))
+ {
+ conditionMeet = true;
+ }
}
}
}
- // Display a QuestChooseWindow (if several quests are available) or QuestWindow
- if (options.size() > 1)
+ if (!conditionMeet)
+ {
+ showQuestWindow(player, npc, "");
+ }
+ else if (options.size() > 1)
{
showQuestChooseWindow(player, npc, options.toArray(new Quest[options.size()]));
}
else if (options.size() == 1)
{
- showQuestWindow(player, npc, options.get(0).getName());
+ showQuestWindow(player, npc, options.stream().findFirst().get().getName());
}
else
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/118_ToLeadAndBeLed/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/118_ToLeadAndBeLed/__init__.py
index c824a9a9188dc2b98544e633ba3bb5cdffb2c750..2bfb5daa8b27064112df5290425dc05d3c30f706 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/118_ToLeadAndBeLed/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/118_ToLeadAndBeLed/__init__.py
@@ -87,7 +87,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
npcId = npc.getId()
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
id = st.getState()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/120_PavelsResearch/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/120_PavelsResearch/__init__.py
index 0fcac23d0ea95b1728af37fe4024974ad6dd0bd8..67af68dcebcf0b43ebdd4023fc6bf9ffc835c6ae 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/120_PavelsResearch/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/120_PavelsResearch/__init__.py
@@ -213,7 +213,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
state = st.getState()
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/123_TheLeaderAndTheFollower/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/123_TheLeaderAndTheFollower/__init__.py
index eaecd5446c89a118138f89151f1057316412f488..8a7635d8ff91d98304cfdc4b59c3b034044afe40 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/123_TheLeaderAndTheFollower/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/123_TheLeaderAndTheFollower/__init__.py
@@ -80,7 +80,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
npcId = npc.getId()
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
id = st.getState()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/__init__.py
index b91b8f8d6f7d51cf94b73e1a4844fe4d2d2f3ec4..715cdf3d71f2f61fd16d1a6c12ea71b25c930bd9 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/__init__.py
@@ -60,7 +60,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/178_IconicTrinity/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/178_IconicTrinity/__init__.py
index b5f98f35abb1efcf7d342f3fba59623e06a29d26..f0f474a18ecf7b11e064e7147b579e07e32ae76b 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/178_IconicTrinity/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/178_IconicTrinity/__init__.py
@@ -100,7 +100,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
npcId = npc.getId()
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
id = st.getState()
cond = st.getInt("cond")
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/184_Nikolas_Cooperation_Contract/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/184_Nikolas_Cooperation_Contract/__init__.py
index dc4e9aeee7f0958aabf68d2c8f5deffcf053c262..f3d46d103bdbdb9276d5318054fb73045bc1c806 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/184_Nikolas_Cooperation_Contract/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/184_Nikolas_Cooperation_Contract/__init__.py
@@ -112,7 +112,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
id = st.getState()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/185_Nikolas_Cooperation_Consideration/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/185_Nikolas_Cooperation_Consideration/__init__.py
index 5aeea3e4f8d5b59ffe547d4b217f60ed8c24cde2..a00b262810b274e53cf38c5b1114a2d3b934f8ae 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/185_Nikolas_Cooperation_Consideration/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/185_Nikolas_Cooperation_Consideration/__init__.py
@@ -112,7 +112,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
id = st.getState()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/216_TrialOfGuildsman/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/216_TrialOfGuildsman/__init__.py
index 35fb37ab93f9c585ab9b5314dffbe04f53fb2322..d28ef096e91236e4a38d0f32a4e2af3fef03a6b5 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/216_TrialOfGuildsman/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/216_TrialOfGuildsman/__init__.py
@@ -137,7 +137,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
id = st.getState()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/220_TestimonyOfGlory/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/220_TestimonyOfGlory/__init__.py
index 587357bb4bf8ed3df96701e811876c151b449da5..92794399ab2be70f53d236b64e6b4ae6cb8ec56d 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/220_TestimonyOfGlory/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/220_TestimonyOfGlory/__init__.py
@@ -186,7 +186,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/222_TestOfDuelist/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/222_TestOfDuelist/__init__.py
index 5d1c02d9705b6833f8780ccb629c9b2c0385d06a..49046730dfb27e9234c570920ea93670927d3955 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/222_TestOfDuelist/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/222_TestOfDuelist/__init__.py
@@ -88,7 +88,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/223_TestOfChampion/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/223_TestOfChampion/__init__.py
index 598e9feef6e6838f533721f7e936fe352fc0c170..ad8da6cbec46b15d9d389702c9149319eb644585 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/223_TestOfChampion/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/223_TestOfChampion/__init__.py
@@ -112,7 +112,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
id = st.getState()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/224_TestOfSagittarius/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/224_TestOfSagittarius/__init__.py
index 99a736754a62037aea8bf3f0b5e6a5236ce5e25e..42850fe0de9a072a50217e14cf05f563f12b29c7 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/224_TestOfSagittarius/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/224_TestOfSagittarius/__init__.py
@@ -128,7 +128,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/__init__.py
index ba5d2644a04459ecd1857e55283b02683f43aab3..ee146f3392e79287be3091aafea28cd4436e90bb 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/__init__.py
@@ -85,7 +85,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
cond = st.getInt("cond")
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/226_TestOfHealer/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/226_TestOfHealer/__init__.py
index 2b2872d83bc4205baaebe9409936db67ed0b18df..7e872692b92faa7b3df4c7fc5cc4d9f5f49ab865 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/226_TestOfHealer/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/226_TestOfHealer/__init__.py
@@ -141,7 +141,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/227_TestOfReformer/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/227_TestOfReformer/__init__.py
index 69fa4a70b9ea36fa3f1d734c19a22093421bff7e..25592ea8df63db0faf01b02b3f1acefcd17f1d69 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/227_TestOfReformer/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/227_TestOfReformer/__init__.py
@@ -83,7 +83,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/228_TestOfMagus/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/228_TestOfMagus/__init__.py
index 47f593008913c31d0ccee39b979fccb40a22cfe3..1120071a5ec6d0a65ce618cee0280146a0f2a8b0 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/228_TestOfMagus/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/228_TestOfMagus/__init__.py
@@ -110,7 +110,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/229_TestOfWitchcraft/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/229_TestOfWitchcraft/__init__.py
index 5243f214a623dab0b14ef24f98126aa2d6ac7e4a..51486a6002ce19b6e71d54e16c113d2db42af068 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/229_TestOfWitchcraft/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/229_TestOfWitchcraft/__init__.py
@@ -66,8 +66,8 @@ DROPLIST={
class Quest (JQuest) :
- def __init__(self,id,name,descr):
- JQuest.__init__(self,id,name,descr)
+ def __init__(self,id,name,descr):
+ JQuest.__init__(self,id,name,descr)
self.questItemIds = range(3308,3336)+[3029]
def onEvent (self,event,st) :
@@ -193,7 +193,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
@@ -219,7 +219,7 @@ class Quest (JQuest) :
return htmltext
# already done
elif id == State.COMPLETED:
- return Quest.getAlreadyCompletedMsg(player)
+ return Quest.getAlreadyCompletedMsg(player)
# in progress, player is working on the quest
else:
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/22_TragedyInVonHellmannForest/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/22_TragedyInVonHellmannForest/__init__.py
index 49fe8af138e72107d10d5e1a29f26b093a74569a..05d4cf36450f7380b1cd0194f7c40648ce9c88f4 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/22_TragedyInVonHellmannForest/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/22_TragedyInVonHellmannForest/__init__.py
@@ -155,7 +155,7 @@ class Quest (JQuest) :
return htmltext
def onTalk (self,npc,player):
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
htmltext = Quest.getNoQuestMsg(player)
if not st: return htmltext
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/230_TestOfSummoner/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/230_TestOfSummoner/__init__.py
index 71fabe9118a10cc4cc2c5453ada13f2ab3a86aa1..cc9dcd1f89f739a3bf40a44b5086f396a60fadc6 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/230_TestOfSummoner/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/230_TestOfSummoner/__init__.py
@@ -195,7 +195,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/__init__.py
index 5b54a2e82330282bc078ecac2dbc3aa87e2df581..ca627796c28095ddb7c3cd7ca3141fed50aee290 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/__init__.py
@@ -94,7 +94,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/232_TestOfLord/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/232_TestOfLord/__init__.py
index 5f8c6b41ba8ac6497e693161cc961d40cc589642..310358bf448f85f17dd06ebabdd18f356a0904c8 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/232_TestOfLord/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/232_TestOfLord/__init__.py
@@ -155,7 +155,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/__init__.py
index d21ceeea2ccd084a05ebbeb7d2105b41055e9e63..3185f921cfb93c5610f0ade41823b2183f24ab9f 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/__init__.py
@@ -143,7 +143,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
@@ -350,9 +350,9 @@ class Quest (JQuest) :
count = st.getQuestItemsCount(item)
if count >= maxcount : continue
st.giveItems(item,1)
- if st.getInt(var) < 9:
+ if st.getInt(var) < 9:
isValue = isValue + 1
- st.set(var,str(isValue))
+ st.set(var,str(isValue))
if st.getQuestItemsCount(KIRUNAS_SKULL) and st.getInt(var)==9:
st.set(var,"10")
st.playSound("ItemSound.quest_middle")
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/234_FatesWhisper/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/234_FatesWhisper/__init__.py
index db93fe4964e774bbcaba3ca8115c1d719a2d6054..d182c38b31dcdd91f7adcc6941fad5e9b8b92666 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/234_FatesWhisper/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/234_FatesWhisper/__init__.py
@@ -138,7 +138,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/236_SeedsOfChaos/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/236_SeedsOfChaos/__init__.py
index 879727b543f28e761cc192d44f6c069d22cf8bbc..3e5cd0861d1a14da1ddb703b74dd13b12f860cc9 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/236_SeedsOfChaos/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/236_SeedsOfChaos/__init__.py
@@ -143,7 +143,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
id = st.getState()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/23_LidiasHeart/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/23_LidiasHeart/__init__.py
index f46ae53b4c68e58cf5912f83e4121b1e77199fc1..619239117c9e27cd65cbc0a535335f1b266adedf 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/23_LidiasHeart/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/23_LidiasHeart/__init__.py
@@ -81,7 +81,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
state = st.getState()
if state == State.COMPLETED :
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/255_Tutorial/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/255_Tutorial/__init__.py
index 59b933dc6d52de03222b63643807edaf7fb9e153..db8a3b3b65cb341aa23ddb5cafee4031c2e8f5bb 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/255_Tutorial/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/255_Tutorial/__init__.py
@@ -131,7 +131,7 @@ class Quest (JQuest) :
def onAdvEvent(self,event,npc,player):
if Config.DISABLE_TUTORIAL :
return
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
classId = int(st.getPlayer().getClassId().getId())
string = event[0:2]
htmltext = ""
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/25_HidingBehindTheTruth/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/25_HidingBehindTheTruth/__init__.py
index 3f761515409aef11113bd9fcb7d32c8102d58edc..b75923ececa8cffb007285e4b9ffc4e5513b66b4 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/25_HidingBehindTheTruth/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/25_HidingBehindTheTruth/__init__.py
@@ -126,7 +126,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
id = st.getState()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/330_AdeptOfTaste/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/330_AdeptOfTaste/__init__.py
index 70ba53b90813ca3a98f366b39b082498d17c9c7a..6faaaf29afdd3066cbb07c31e7d3797de10ca416 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/330_AdeptOfTaste/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/330_AdeptOfTaste/__init__.py
@@ -109,7 +109,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/333_BlackLionHunt/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/333_BlackLionHunt/__init__.py
index d3af66a5505d7c555acf99d3762583553d10c29d..96277bc0f5583d164bad382b5878a55715af89a9 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/333_BlackLionHunt/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/333_BlackLionHunt/__init__.py
@@ -462,7 +462,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/334_TheWishingPotion/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/334_TheWishingPotion/__init__.py
index 41a50ec813295335a96847bda7b1661ca84de1cb..7755155c63e7e1509d36b2a92d0d4d99aaf18116 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/334_TheWishingPotion/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/334_TheWishingPotion/__init__.py
@@ -228,7 +228,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
cond = st.getInt("cond")
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/335_TheSongOfTheHunter/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/335_TheSongOfTheHunter/__init__.py
index b218eaf071d4ae57c55cb4fccb5746ed700c34f2..28242bc3d676a878bc5cef6d96e1da3b0466f42c 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/335_TheSongOfTheHunter/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/335_TheSongOfTheHunter/__init__.py
@@ -398,7 +398,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
cond = st.getInt("cond")
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/336_CoinOfMagic/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/336_CoinOfMagic/__init__.py
index f7fb2f9baa7b6098208345ed866bd16324e75ce9..23ae418178905f450f369b17424ec0675c34980c 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/336_CoinOfMagic/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/336_CoinOfMagic/__init__.py
@@ -292,7 +292,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/337_AudienceWithTheLandDragon/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/337_AudienceWithTheLandDragon/__init__.py
index badb6190a03be8b5a194961d71605fd1e9ef475e..ed2d4f4d264a95addf7fc2c8f52ef61e1b4a9ea7 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/337_AudienceWithTheLandDragon/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/337_AudienceWithTheLandDragon/__init__.py
@@ -102,7 +102,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
cond = st.getInt("cond")
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/__init__.py
index 06970df0abd18978ab14bf388fd484c92e3c4ff0..70cec7f56f507631151605ca7718bd97b74be9dd 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/__init__.py
@@ -64,7 +64,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
npcId = npc.getId()
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
id = st.getState()
cond = st.getInt("cond")
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/343_UnderTheShadowOfTheIvoryTower/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/343_UnderTheShadowOfTheIvoryTower/__init__.py
index 2e53697b6881ad6eaa6aa246bd2e58dacd5dc9ca..4d86638ccd4315d130c9615502fe1f77b7d1e511 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/343_UnderTheShadowOfTheIvoryTower/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/343_UnderTheShadowOfTheIvoryTower/__init__.py
@@ -149,7 +149,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/348_ArrogantSearch/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/348_ArrogantSearch/__init__.py
index 17e6480a65a68344f54e7c71e374ee77bbb2f4cc..621a39f92a9ec4cd961d9929dd451f6f99671a24 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/348_ArrogantSearch/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/348_ArrogantSearch/__init__.py
@@ -192,7 +192,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/351_BlackSwan/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/351_BlackSwan/__init__.py
index 5898701fc9a02a820c97bf9b9ba1047b41e022a0..742160592fd909ced82e237bb4ae81e85bb0bc98 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/351_BlackSwan/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/351_BlackSwan/__init__.py
@@ -52,7 +52,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
id = st.getState()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/372_LegacyOfInsolence/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/372_LegacyOfInsolence/__init__.py
index dcd8837505d1d6107e8519b4441efbad8d1d7fb7..2ea4dabbc26f3f596c1fcc4fbc1026bc0b72f17f 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/372_LegacyOfInsolence/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/372_LegacyOfInsolence/__init__.py
@@ -133,7 +133,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/373_SupplierOfReagents/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/373_SupplierOfReagents/__init__.py
index 4e3cd367b7e193d0e3b8a088cee8bb8858a225ab..cb3ea5da338eafa205ede46d1678a6de797d18d8 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/373_SupplierOfReagents/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/373_SupplierOfReagents/__init__.py
@@ -251,7 +251,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/383_SearchingForTreasure/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/383_SearchingForTreasure/__init__.py
index 83c8a2c1bc938d633442c9a85c0597e7e9c5223f..4ad1261b7f0dcbe4c458dc5e3eb60d7fccd7bd2e 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/383_SearchingForTreasure/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/383_SearchingForTreasure/__init__.py
@@ -67,7 +67,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/384_WarehouseKeepersPastime/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/384_WarehouseKeepersPastime/__init__.py
index 9e00b55002440f39712b6e34ac8d52c0112dd87c..010affe0c4874e35d2ea689377625a8b28e49c26 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/384_WarehouseKeepersPastime/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/384_WarehouseKeepersPastime/__init__.py
@@ -213,7 +213,7 @@ class Quest (JQuest) :
return htmltext
def onTalk (self,npc,player) :
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
htmltext = Quest.getNoQuestMsg(player)
if not st: return htmltext
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/386_StolenDignity/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/386_StolenDignity/__init__.py
index 45d359dcfc83ec0dc447be104ee4543de8551c3a..4f06c9a6afc9d026d27f6f243344f3f4969437e7 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/386_StolenDignity/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/386_StolenDignity/__init__.py
@@ -175,7 +175,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/419_GetAPet/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/419_GetAPet/__init__.py
index 51132a57820d3dce5dd597f7e9649ae5f99764e8..9f081bcc4db0e2d24f3c428d1551098c27d446e7 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/419_GetAPet/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/419_GetAPet/__init__.py
@@ -180,7 +180,7 @@ class Quest (JQuest):
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/__init__.py
index 1012c2b03cf431fda4a0ac49168e92bb5cfcee01..a5f0ad7cc8f93e2cf1d874c55b455129f65dc69b 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/__init__.py
@@ -128,7 +128,7 @@ class Quest (JQuest) :
def onTalk (Self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
condition = st.getInt("cond")
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/426_FishingShot/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/426_FishingShot/__init__.py
index 28cea2b0a06927ef3307ef126f568c5ceb4d5484..878c5f36c0936ca77510ddf5b957ba4faed7cd72 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/426_FishingShot/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/426_FishingShot/__init__.py
@@ -79,7 +79,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/503_PursuitClanAmbition/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/503_PursuitClanAmbition/__init__.py
index e0f7a6fbad9e8d679e853fe267fdac2b547ae9bf..b9715b2831cc11d5db5dec06145e55e1f13b429f 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/503_PursuitClanAmbition/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/503_PursuitClanAmbition/__init__.py
@@ -296,7 +296,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/604_DaimontheWhiteEyedPart2/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/604_DaimontheWhiteEyedPart2/__init__.py
index e1c8e6602870a45ea9e448996ad523b781e3938e..179694054694e5b9dbd82d81840bab7f47df17a0 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/604_DaimontheWhiteEyedPart2/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/604_DaimontheWhiteEyedPart2/__init__.py
@@ -90,7 +90,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if st :
npcId = npc.getId()
id = st.getState()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/60_GoodWorkReward/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/60_GoodWorkReward/__init__.py
index 759f1317a00fe5370426e2bc5c95dcdfef2199a6..e8ab9c53872ee99ca3fc80857dea423f8bbde3ba 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/60_GoodWorkReward/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/60_GoodWorkReward/__init__.py
@@ -149,7 +149,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/620_FourGoblets/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/620_FourGoblets/__init__.py
index 0b25a8e19f191c5f6825533a4c0f60e1aff7a032..76e5cf92026dbf863ed03b70e7e009b537f639ab 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/620_FourGoblets/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/620_FourGoblets/__init__.py
@@ -39,7 +39,7 @@ class Quest (JQuest) :
def onTalk (Self,npc,player) :
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
id = st.getState()
if id == State.CREATED :
st.set("cond","0")
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/65_CertifiedSoulBreaker/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/65_CertifiedSoulBreaker/__init__.py
index c40356ee6dd3c0766ab658c52106495891a7b1d5..2c30379869d91bf2ab653207c0fc3b338b3ad498 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/65_CertifiedSoulBreaker/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/65_CertifiedSoulBreaker/__init__.py
@@ -113,7 +113,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
id = st.getState()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/663_SeductiveWhispers/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/663_SeductiveWhispers/__init__.py
index bcbacac20008c185dfdfdbeba5bff9ac4b92807e..d244a27e529b6b6cf71b02802c8395abe60ec2c7 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/663_SeductiveWhispers/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/663_SeductiveWhispers/__init__.py
@@ -152,7 +152,7 @@ class Quest (JQuest) :
return htmltext
def onTalk (self,npc,player):
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
htmltext = Quest.getNoQuestMsg(player)
if not st : return htmltext
npcId = npc.getId()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/66_CertifiedArbalester/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/66_CertifiedArbalester/__init__.py
index 0b139aad2ef6550a6f177bdc5003012b4977cfd4..20a81a5e91784fe8e7ac60ff22eb2eca53da726f 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/66_CertifiedArbalester/__init__.py
+++ b/L2J_DataPack/dist/game/data/scripts/quests/66_CertifiedArbalester/__init__.py
@@ -96,7 +96,7 @@ class Quest (JQuest) :
def onTalk (self,npc,player):
htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
+ st = self.getQuestState(player, true)
if not st : return htmltext
npcId = npc.getId()
id = st.getState()
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/AbstractSagaQuest.java b/L2J_DataPack/dist/game/data/scripts/quests/AbstractSagaQuest.java
index 411fdd4139e31afc5b8f0d69ab5240bcf9f952d5..b2fe5ef407787c26af9eb8ac3d996f9b415e81d0 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/AbstractSagaQuest.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/AbstractSagaQuest.java
@@ -745,7 +745,7 @@ public abstract class AbstractSagaQuest extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st != null)
{
int npcId = npc.getId();
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java
index eda7dcd39d8fe24887a7927b11dcb7f831b85f97..e95ff9f26c566598475d76e2e880bcff2b2e3df3 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java
@@ -88,7 +88,7 @@ public class Q00001_LettersOfLove extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return getNoQuestMsg(player);
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java
index a70588e0d9401df17a8eb941e7d953bd64fe271c..2c618e2080f494a33739a07b79bb5e4fda9027bd 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java
@@ -97,7 +97,7 @@ public class Q00002_WhatWomenWant extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java
index 5ec2e5cebdcf3b4a0fc5687e09051a7337c97e3c..8773ae7c43b22c3d8f8fe5f35cc6f00f018762fa 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java
@@ -113,7 +113,7 @@ public class Q00003_WillTheSealBeBroken extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java
index d6b676903e93cda108a2e6a3e1a315ed4de6962b..00cd7b6e10d875aee341a919941e2e5e6a4d9ea2 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java
@@ -88,7 +88,7 @@ public class Q00004_LongLiveThePaagrioLord extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java
index 2249118e50546360b6c7f034ebcafe28804e3897..95ed745379e7b5b26a500225269e2cdf7ad9b377 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java
@@ -96,7 +96,7 @@ public class Q00005_MinersFavor extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java
index d2ef32a96a1b2b1b1a629aebb8293f6fc836ad30..9814f9e59dedc93c1c4b023eb181dfba276e27a2 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java
@@ -93,7 +93,7 @@ public class Q00006_StepIntoTheFuture extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java
index 2e1def6d278de4d811e75973b92e3ad7c2a09f8d..7e1f9ba1bb35e6b30ae11da8ce623c6983cc8d3d 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java
@@ -93,7 +93,7 @@ public class Q00007_ATripBegins extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java
index 5f1bcf8d08c6192e4c80318c0895c30e2d086274..7b04aeee02e24e1b57812ac4163528fb42ec9d9f 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java
@@ -93,7 +93,7 @@ public class Q00008_AnAdventureBegins extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java
index b5a230e211fab7d21d41d0baeb035a40eba75001..b15b9cc233e11d99cec3f5c891f0787c71d7e0dd 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java
@@ -82,7 +82,7 @@ public class Q00009_IntoTheCityOfHumans extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java
index 7632ee0a34ebee04fa081ebf37c5cf903465d54a..27f63ae501ac0b3791f1eebfdd80f97dd91a5064 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java
@@ -96,7 +96,7 @@ public class Q00010_IntoTheWorld extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java
index 084744325cc0fd6e8b19430d9a7865f770aa6d15..f57ef9b9ad63626007d245c8c50f1aa0a6b24d08 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java
@@ -87,7 +87,7 @@ public class Q00011_SecretMeetingWithKetraOrcs extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java
index 3576729538971f9b5a305b7cf45b34d136287cf2..ccc200c2d628164c6b30f3de961036edbd873072 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java
@@ -87,7 +87,7 @@ public class Q00012_SecretMeetingWithVarkaSilenos extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
index 128cf227768cd500928d7c21d6ff3dada67707ba..a9e0f48963f7670f16a2217ed89f6de62742fb16 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
@@ -81,7 +81,7 @@ public class Q00013_ParcelDelivery extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java
index 6986556e82c1d34f192bef15f9cfc28005ee3b2d..0990d329c0715e1afbe77ed84061698c9473e799 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java
@@ -81,7 +81,7 @@ public class Q00014_WhereaboutsOfTheArchaeologist extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
index 5c4bbdc89792f2d6bb2ba7408efb9f035df53e90..ec3eaf81671cca55084fbfbac0e3c5be5560ade0 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
@@ -79,7 +79,7 @@ public class Q00015_SweetWhispers extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
index fd281777cbb6a4ed78eaabe2afc54c8bcc98cd52..71dcadf1c113eede16d4ec8ebca0b279d97473c6 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
@@ -89,7 +89,7 @@ public class Q00016_TheComingDarkness extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
index ce764c9d71469dac175ec3d34fa29690ed39598e..f270e35c4aa7a964d52444c47c5277e6fc992d01 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
@@ -94,7 +94,7 @@ public class Q00017_LightAndDarkness extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java
index 343c02368b435c79bc4a3b192e1bd794cc860271..492ecfdae520c1bbdae5d5f0e1af7357f8e56ea0 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java
@@ -88,7 +88,7 @@ public class Q00018_MeetingWithTheGoldenRam extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
index e6683d4dd74790149a38d5001220f2a9de4b271f..e48926ff4256cf740ca80d7dfb90dea95f2a71a7 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
@@ -90,7 +90,7 @@ public class Q00019_GoToThePastureland extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
index ac44c26438548035414d9d3af488b26b9d9a299f..835af888650880499dee0e860bf9875b6623fb68 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
@@ -95,7 +95,7 @@ public class Q00020_BringUpWithLove extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java
index 8d5e829bf9d118cae38839cd5bb37222a130f37e..05444fcc85a5a1521bfb368ac3bfda2fa4287f1c 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java
@@ -216,7 +216,7 @@ public class Q00021_HiddenTruth extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- QuestState st = player.getQuestState(getName());
+ QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java
index 96a9419930b2db9c88a8680933c9893a5ef04920..25480310bf82290b47363a689bcc3c9a1b2d98fc 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java
@@ -220,7 +220,7 @@ public class Q00024_InhabitantsOfTheForestOfTheDead extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java
index 845ac7fdc4e39a294dc2e4c75bc5cd223504d355..c993f7b765017d58d77293999e6dbe1b48c57580 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java
@@ -111,7 +111,7 @@ public final class Q00026_TiredOfWaiting extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java
index 19d47918e3bf061d6cfa663e3a10e815c7e57d5f..9478128004dad924ed837547b0a1f0459200aa42 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java
@@ -90,7 +90,7 @@ public class Q00027_ChestCaughtWithABaitOfWind extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java
index ecd8089c81d5f58b445dbb3837eaca9ce1af35c4..2d4f12bafaa54a47b87bb1c22dc718f7df33473c 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java
@@ -90,7 +90,7 @@ public class Q00028_ChestCaughtWithABaitOfIcyAir extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java
index 3e9387825ae64d796dc6b05f95dedd913ace638e..d18a5beb45c81ca580defb7abd0be3170a55d6ff 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java
@@ -90,7 +90,7 @@ public class Q00029_ChestCaughtWithABaitOfEarth extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java
index 2faa23625443816ef0a326a1a77031a2fb3fcef2..715420833cf1eed52ebe20aa94faf57e22e9eb5b 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java
@@ -89,7 +89,7 @@ public class Q00030_ChestCaughtWithABaitOfFire extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
index 69322737901ec68fcd62e2131c3b2acc7e14fba5..ff2ed5927e2d19e80ecaa0cf9ebd6f978e799ea0 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
@@ -127,7 +127,7 @@ public final class Q00031_SecretBuriedInTheSwamp extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
index 78065daa102ff8f9ad0f8ed4c98b41011a4876a5..c19169a2452b996fcec481a5389e56183e94261c 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
@@ -111,7 +111,7 @@ public class Q00033_MakeAPairOfDressShoes extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
index e2d2397a360fe567acded3b02efa8c88ad916160..f4f80a5887bc8ccd37fb9322b5e98bd1096c6c75 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
@@ -140,7 +140,7 @@ public class Q00034_InSearchOfCloth extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
index c7fd5a6e053ff67898cdb5a4e172f7e8370ec36b..ad535f7a716958ee3d43e774a6b9d67b8fe7d7cd 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
@@ -132,7 +132,7 @@ public class Q00035_FindGlitteringJewelry extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
index f348e013d4ee65526e4fafc5f6dea4b1f3224a9f..c65c0c0d7fe61a840ca030454fc817cd3c761387 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
@@ -124,7 +124,7 @@ public class Q00036_MakeASewingKit extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
index 3335495c704a017b7b0b0dd3a7694f238c8aa1fc..3d632d33c3c7301b2ecc1df032762de40db71428 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
@@ -128,7 +128,7 @@ public class Q00037_MakeFormalWear extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
index 30a9ea7d7668efd504323a3c88c3965ec8098f29..df6606e7bcc2fd49343d1de3ccd8db42305b424c 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
@@ -134,7 +134,7 @@ public final class Q00040_ASpecialOrder extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
index bdd3116b0c832694a6139d5ec9bdf8871e53223c..326bba57f1283fdb27ccabaa275091e299fbfc40 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
@@ -134,7 +134,7 @@ public class Q00042_HelpTheUncle extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
index aabdc03e8f73ebbaf06c3379b181f86bf670d846..b8a94c7972d3f4583ec880a96ca361542b351df6 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
@@ -134,7 +134,7 @@ public class Q00043_HelpTheSister extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
index 159798cf9d49b369a1a2f300da333b4ae5791648..e0d11e754ccb9d56fef0a64e9b18a4c1ff41242e 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
@@ -135,7 +135,7 @@ public class Q00044_HelpTheSon extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java
index 697c94a9fcbf279688d194f1c8d822d0de4fb3b4..2d08ec58318dd00646c38ec1a0664f8248a2883e 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java
@@ -188,7 +188,7 @@ public final class Q00045_ToTalkingIsland extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance talker)
{
- QuestState st = talker.getQuestState(getName());
+ QuestState st = getQuestState(talker, true);
String htmltext = getNoQuestMsg(talker);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java
index 6da3a79e855e6a67c10ea83e959fcd797910d611..2005608e1d5add471a2bbcc170e0ab34a1d03c81 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java
@@ -188,7 +188,7 @@ public final class Q00046_OnceMoreInTheArmsOfTheMotherTree extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance talker)
{
- QuestState st = talker.getQuestState(getName());
+ QuestState st = getQuestState(talker, true);
String htmltext = getNoQuestMsg(talker);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java
index 9a882697ddb1d9e1f4faf91c7bbf15ab23a5ddc2..e0ec006bc8fa9a0cb226c96f61092caebdf065cd 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java
@@ -188,7 +188,7 @@ public final class Q00047_IntoTheDarkElvenForest extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance talker)
{
- QuestState st = talker.getQuestState(getName());
+ QuestState st = getQuestState(talker, true);
String htmltext = getNoQuestMsg(talker);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java
index ce2f1dd82e9f32f2958b84e2306115906679c90a..64c080c7f1a8c4fca58d3eac112cd9b938bf28fa 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java
@@ -188,7 +188,7 @@ public final class Q00048_ToTheImmortalPlateau extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance talker)
{
- QuestState st = talker.getQuestState(getName());
+ QuestState st = getQuestState(talker, true);
String htmltext = getNoQuestMsg(talker);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java
index 7e9a5117bcf502cbe907fbf3b430ca00b4dcc497..e5bf8b858543e11df61b116e608e53fe278290e7 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java
@@ -188,7 +188,7 @@ public final class Q00049_TheRoadHome extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance talker)
{
- QuestState st = talker.getQuestState(getName());
+ QuestState st = getQuestState(talker, true);
String htmltext = getNoQuestMsg(talker);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java
index cea6a0e123c3b199e8292eaf353d2c69c08916d4..31be123c756daea711bf78a886c15f0d8220382b 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java
@@ -111,7 +111,7 @@ public class Q00050_LanoscosSpecialBait extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java
index bfaf467b470981cb4159990069921d97055d9e78..eab808d6da791978ac51b836569c3d39bae66169 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java
@@ -107,7 +107,7 @@ public class Q00051_OFullesSpecialBait extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java
index 18a011ba5caae9d7b7abd7db05943194231517e1..978042b3aa0ab14455d93d11cf3a242c3fcf9253 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java
@@ -107,7 +107,7 @@ public class Q00052_WilliesSpecialBait extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java
index c74ac9fe77128e88ac1b8a6f5293ad9437b4e54a..511f497be49fb0d433d2bbd3eff22feb0050f635 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java
@@ -119,7 +119,7 @@ public class Q00053_LinnaeusSpecialBait extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java
index 7f01ab1c9120f00f05cdea01b96cffc02f29fb5f..93d688cec22692f597da1caa913549dd8386555e 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java
@@ -20,8 +20,8 @@ package quests.Q00101_SwordOfSolidarity;
import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
-import com.l2jserver.gameserver.enums.Race;
import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.Race;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.ItemHolder;
@@ -165,7 +165,7 @@ public class Q00101_SwordOfSolidarity extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java
index 2fe6137c347de65dec5fae99f78fccec4a37e943..b070fcbd13a230e433ed66c81593162a5e742209 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java
@@ -21,8 +21,8 @@ package quests.Q00102_SeaOfSporesFever;
import java.util.HashMap;
import java.util.Map;
-import com.l2jserver.gameserver.enums.Race;
import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.Race;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
@@ -121,7 +121,7 @@ public class Q00102_SeaOfSporesFever extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java
index 2efea04a5950d671e0c66a08525d2c5d89b3dc48..76f5dd593db7b161e329a8998c06146858cbba55 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java
@@ -116,7 +116,7 @@ public final class Q00104_SpiritOfMirrors extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
index 1d6ae21672d623d70619f312bbcd0711d098b3c3..e91201194dc66859c295b95c1c06fcc26c177e76 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
@@ -156,7 +156,7 @@ public final class Q00105_SkirmishWithOrcs extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance talker)
{
- final QuestState st = talker.getQuestState(getName());
+ final QuestState st = getQuestState(talker, true);
String htmltext = getNoQuestMsg(talker);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
index 2712e2362e4cd6c6cae881c40cf747e3511744ee..d976527cfb81caeb05dbdadb3496f58af1911e78 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
@@ -20,8 +20,8 @@ package quests.Q00106_ForgottenTruth;
import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
-import com.l2jserver.gameserver.enums.Race;
import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.Race;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
@@ -115,7 +115,7 @@ public final class Q00106_ForgottenTruth extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance talker)
{
- final QuestState st = talker.getQuestState(getName());
+ final QuestState st = getQuestState(talker, true);
String htmltext = getNoQuestMsg(talker);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
index 9c10b15f689aa7cf15455809aa52069751ad5ca5..9e5d8acb4a7eb2fd022df8b73d4d609ac4fa217e 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
@@ -23,8 +23,8 @@ import java.util.Map;
import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
-import com.l2jserver.gameserver.enums.Race;
import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.Race;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.ItemHolder;
@@ -146,7 +146,7 @@ public final class Q00108_JumbleTumbleDiamondFuss extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance talker)
{
- final QuestState st = talker.getQuestState(getName());
+ final QuestState st = getQuestState(talker, true);
String htmltext = getNoQuestMsg(talker);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
index a9545a7c79395d5d25d7dd46a745c2842793cb5c..5e3d557a9387ab9e726991030a72cb8033d62c41 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
@@ -80,7 +80,7 @@ public class Q00109_InSearchOfTheNest extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
index 6dd294a4b4a58a5ee45293a70ad904562780b422..a55e84a1c620962e0b072a5a034c319e557fc430 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
@@ -73,7 +73,7 @@ public class Q00110_ToThePrimevalIsle extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java
index 42c107ad72afcfee8fed7ce1fb88ac0a6f515db5..24b6747b4c8bbf66f3fc8fb1e2d0cd0e9c341f13 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java
@@ -78,7 +78,7 @@ public class Q00112_WalkOfFate extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java
index bd52eb56432f6188437fd20ccbe234685b49feef..9feeb7a2584844d519290ac00493d33ff22298ad 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java
@@ -87,7 +87,7 @@ public class Q00113_StatusOfTheBeaconTower extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java
index 4973c15179b56791ec2adcaecd4f5c768fe0955d..daaa758f050b6788cff4ac24b307375d275352f7 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java
@@ -358,7 +358,7 @@ public class Q00114_ResurrectionOfAnOldManager extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
index af9fa862f21a75994adab9b9f2aae543405e73ba..b8ce2705c308e41cb32e1a01585a832a7fe7a0ad 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
@@ -387,7 +387,7 @@ public class Q00115_TheOtherSideOfTruth extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
index de041b25364222e6c6092a8e8ee44dfbd0fcddb4..84098d10e7e1c9182a45bfc7d5a21f0bb8c65fd9 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
@@ -102,7 +102,7 @@ public class Q00119_LastImperialPrince extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java
index bf104f0b0b3c5c479567ce1f140c283d6c8f7193..5699df1531c22c0d8bee2599f672a03e0adb3dd9 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java
@@ -68,7 +68,7 @@ public class Q00121_PavelTheGiant extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java
index 63e00f0d06becff419a9bbb0ba5460c9212f7365..d204ae1e40fad18e2900901f8927e4173ca764ec 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java
@@ -69,7 +69,7 @@ public class Q00122_OminousNews extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
index 662ee94d6d3d5a310f5979aea25e323303eb5e33..cd71a47eeccd6d65e4ddbd051f7c6f41f13a15b8 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
@@ -100,7 +100,7 @@ public class Q00124_MeetingTheElroki extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
index 2d41c9a13a9711a49abd63a2d8abceea5de32b08..d3fb7f56ffcc0b9bfde4b2eaa81487f8f62bbeaa 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
@@ -292,7 +292,7 @@ public class Q00125_TheNameOfEvil1 extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(getName());
+ QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
index cc496067aa6344a29eab456a3e73f92b88d05a25..0f4ad38a01b11dededa826bc522f89369b8c1dc1 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
@@ -337,7 +337,7 @@ public class Q00126_TheNameOfEvil2 extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(getName());
+ QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
index 5584636665ad17426692c9d5bc761ab78c8f1e83..f322a203b4cfe75f23f6bcc1d0d2c0c621924e0f 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
@@ -183,7 +183,7 @@ public final class Q00128_PailakaSongOfIceAndFire extends Quest
public final String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00130_PathToHellbound/Q00130_PathToHellbound.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00130_PathToHellbound/Q00130_PathToHellbound.java
index 280815d6e5fb111c5e33547c74f03d38bdd5804f..b58f68c274acee6f2063a2d950a03691c24b78db 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00130_PathToHellbound/Q00130_PathToHellbound.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00130_PathToHellbound/Q00130_PathToHellbound.java
@@ -122,7 +122,7 @@ public class Q00130_PathToHellbound extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00131_BirdInACage/Q00131_BirdInACage.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00131_BirdInACage/Q00131_BirdInACage.java
index 6cf0b1acd13ee22c21a0240a1a3e1eb89a3ecc6e..87a136a1780aaa56347c458c8c0ad950a8d45576 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00131_BirdInACage/Q00131_BirdInACage.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00131_BirdInACage/Q00131_BirdInACage.java
@@ -166,7 +166,7 @@ public class Q00131_BirdInACage extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java
index 278792983662a8292c8c6b85fb9bd7e71ce702d4..68bdc72151a861bc5246a90f672dd4533c02b685 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java
@@ -142,7 +142,7 @@ public final class Q00132_MatrasCuriosity extends Quest
public final String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java
index 625eeac6cf6d95d1e1962dd8f2ffd9561bd6117e..6bc236dd89adf33261a2998259aa03fcddc8302a 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java
@@ -152,7 +152,7 @@ public class Q00133_ThatsBloodyHot extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
index fe59f45abc96f437915c152e79fe2d96e3dc0f25..88f50740dab9c8517d61c314f6d69285f81d5582 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
@@ -162,7 +162,7 @@ public class Q00134_TempleMissionary extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
index 25e88fbf2ea51eb4864c158b555341b985c763ee..61fe36fee9bbf6658d783661691e6a2a8e72da22 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
@@ -152,7 +152,7 @@ public class Q00135_TempleExecutor extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
index 5a9a535b08ff6e19d6df029ec115d4f43c04858b..406ac56ef3c7fa60ed5be48b31c69c836ced13e2 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
@@ -171,7 +171,7 @@ public class Q00136_MoreThanMeetsTheEye extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
index f85a609e08ef9e35b2c5ba4116992aff04a25ca4..a398cc1d6187128feb2f5bf75ac23e7d362ede9f 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
@@ -118,7 +118,7 @@ public class Q00137_TempleChampionPart1 extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
index b4be96901f2cfc4ff22deaeafedeb27d03b50690..b660422674972f11d6b587fb3f2307813c0b88b4 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
@@ -139,7 +139,7 @@ public class Q00138_TempleChampionPart2 extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
index 07ce042a8ec547d5d2ebde6ad9e9979cef8471a5..0bd133e7d0492e2f882e93e3438df0c16ea5855e 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
@@ -144,7 +144,7 @@ public class Q00139_ShadowFoxPart1 extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
index 678819cf322b1a3d2a53c300b8189fd01f6107f0..e5b92386989561ed9f742b9f9b28ab4a1a084164 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
@@ -154,7 +154,7 @@ public class Q00140_ShadowFoxPart2 extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
index 3a093f5ad2ac7116bdb3db6b40a216cb6665d91d..0f6faf40e6a55fab1b936995a7d866ce420290fe 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
@@ -149,7 +149,7 @@ public class Q00141_ShadowFoxPart3 extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
index 288912a54364a41e3a2ab201335baea452d519de..7ca530816fd85cce6fc0926376cdacc824f82e34 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
@@ -174,7 +174,7 @@ public class Q00142_FallenAngelRequestOfDawn extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
index 0828eac168306811508a22d61c6bcb52003061ae..6bbc351dc9ac4309f764006588769697ba1e8cec 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
@@ -144,7 +144,7 @@ public class Q00143_FallenAngelRequestOfDusk extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
index df310c3e8a87de814d89034c728ec5d0fb08e7f3..403f928a30d40f453330e6871501034aaaa4b5d0 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
@@ -84,7 +84,7 @@ public class Q00146_TheZeroHour extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java
index b29586b724b79b12a949be05ebacc96b533291e2..92dba41cd4f83a4f77a993a0b96ef4c1bb3b84d0 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java
@@ -85,7 +85,7 @@ public class Q00147_PathtoBecominganEliteMercenary extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java
index 82d6340fb3347911101f8992a99e57988549c666..b15af6b15d443893aeac60c6620391a034fd98a9 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java
@@ -82,7 +82,7 @@ public class Q00148_PathtoBecominganExaltedMercenary extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java
index d64cef8b141e3f9d85ffbd6cebe14c25839e2ada..7fb2bea82824e0a1189712b073b28499cf9db83a 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java
@@ -86,7 +86,7 @@ public class Q00151_CureForFever extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java
index ac4e0090cf453329619c7de4c69b21cb4050f7cb..84bb60d0601641e56af297b8646c6749ef6ef7ff 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java
@@ -108,7 +108,7 @@ public class Q00152_ShardsOfGolem extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
index 76d0c48204bd461f08e775e1836c6302bc4ff635..0f530e5d7c0b63247f9c6d6ee99e35c86b8fdcff 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
@@ -79,7 +79,7 @@ public class Q00153_DeliverGoods extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st != null)
{
if (npc.getId() == ARNOLD_ID)
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java
index 180f8821ba66ca7bee130fd8d81fb0f02b2152d2..f437305f707bd1e46676b0d3811a891622b441b7 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java
@@ -64,7 +64,7 @@ public class Q00155_FindSirWindawood extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java
index bd104ab5b6cde18de60a75582b20acd1b7059875..650e9d57551e9f130b9ab809b390f7e32174486b 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java
@@ -106,7 +106,7 @@ public class Q00156_MillenniumLove extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java
index 9993e903081c889153ec7d20cea5f618b95d22f4..9d9c3d0d46ebbf39bf9e3f26c837d31ac55b6612 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java
@@ -97,7 +97,7 @@ public class Q00157_RecoverSmuggledGoods extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java
index 8c4b69e7e1bdc9c24f86a491b817f02c67037783..a1e4f4a6c83a6cc09b3bd8b67381f84f35c6ff53 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java
@@ -93,7 +93,7 @@ public class Q00158_SeedOfEvil extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java
index 3864cdd360678d32f1682306aeda91b266bbdcf2..1b856b45707b642511d379acf7f4e209655138fc 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java
@@ -107,7 +107,7 @@ public class Q00159_ProtectTheWaterSource extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java
index 368f223d7e26f9e679a6578a86244b21f2e255d5..e578531c2c7e0c420c5a8581ce1d45da46409ba6 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java
@@ -78,7 +78,7 @@ public class Q00161_FruitOfTheMotherTree extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java
index cb9c9dc559a814f929f20d21f4fe47630161aa5a..1e6163aea5dcd139626cb0533a3f956bffe61670 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java
@@ -143,7 +143,7 @@ public class Q00162_CurseOfTheUndergroundFortress extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java
index 67e846ee3639edfe05987516ac7ffde4f4f8e7d2..23b9f02f74d4308c83a161b34686c9543b5354db 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java
@@ -144,7 +144,7 @@ public class Q00163_LegacyOfThePoet extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java
index fbe15c739393f856048686316a664f42d698aa42..068d120632386e3a184c92be0a1c9b54aa888e61 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java
@@ -80,7 +80,7 @@ public class Q00164_BloodFiend extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java
index 65c79f2fab30ff22d7111af7642f8e6660321b7d..ede24427675c3b57999b2f53523efb6862b3c331 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java
@@ -96,7 +96,7 @@ public class Q00165_ShilensHunt extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java
index 72c8b4464940ac33a0ce00899ca015a3c99ff293..142849e4f922f4371ba2a31d44e8934dcaa1a54c 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java
@@ -79,7 +79,7 @@ public class Q00166_MassOfDarkness extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
index 5697a839a728486344fca4db0689787cc1c81c63..4171546f8b9c4a7c45d1603cebe48c11496f63f1 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
@@ -109,7 +109,7 @@ public class Q00167_DwarvenKinship extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java
index 71cde178664c8855521a5bf6e6fb04c050353059..4aa81cebe6e335d68bc3107bf54d36fb21b15fc7 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java
@@ -78,7 +78,7 @@ public class Q00168_DeliverSupplies extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java
index 3a29ba505b4c13fbc703ade0557df0b8ac93cede..3b442e0ea83e42c6eb010fd38b2804f628113a5c 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java
@@ -110,7 +110,7 @@ public class Q00169_OffspringOfNightmares extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java
index 0fdcd43f1c94c0cbca1e91673a8f6efcb00e21ea..3365067c957732f7a120f0a505f4bf666a9c9147 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java
@@ -90,7 +90,7 @@ public class Q00170_DangerousSeduction extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java
index 4c583f4e3def5666de46c718a5daed0016c15cff..f88190631cca5a417c243b3881f6eed6cecb8bdd 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java
@@ -80,7 +80,7 @@ public class Q00172_NewHorizons extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java
index dd2b378456c58fa006f434f9ceeb306d9efd1208..0bcf0ab78729fe2272f86c6b2ef75b8695711665 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java
@@ -89,7 +89,7 @@ public class Q00173_ToTheIsleOfSouls extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00174_SupplyCheck/Q00174_SupplyCheck.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00174_SupplyCheck/Q00174_SupplyCheck.java
index 297f1ff11448c7a73cff4db19a195c92a14d1293..a8c2658094872132cd6c425792bd7448579865fa 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00174_SupplyCheck/Q00174_SupplyCheck.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00174_SupplyCheck/Q00174_SupplyCheck.java
@@ -81,7 +81,7 @@ public class Q00174_SupplyCheck extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00176_StepsForHonor/Q00176_StepsForHonor.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00176_StepsForHonor/Q00176_StepsForHonor.java
index 0daa8d430c0d588be25b52dd6166ceb455f2b15f..db76628dac0108dd6b610ac69ff5d3eaaf92846b 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00176_StepsForHonor/Q00176_StepsForHonor.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00176_StepsForHonor/Q00176_StepsForHonor.java
@@ -61,7 +61,7 @@ public class Q00176_StepsForHonor extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java
index 7370c0286fe4f8cd6219553af9596cbf75f8cbdf..ceef8ce6049f2f70436114bd34c68c976c5074f8 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java
@@ -83,7 +83,7 @@ public class Q00179_IntoTheLargeCavern extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java
index bbf02562ce9777921690680a356263ff28b062c6..8eaea01e3ed60894e15b895e70af8e93db73d2d7 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java
@@ -80,7 +80,7 @@ public class Q00182_NewRecruits extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
index f80df010aeab978ccda7b8a5c2b6f30d4b432d08..715a82aaf522de2354ec1aaf0d14d83fadca5a13 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
@@ -117,7 +117,7 @@ public final class Q00183_RelicExploration extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
index 0f1be5b59c9755a4ad52f76db3f610f5a1e800bc..505c1a2e71066d0da4b9257bc85064df648187b5 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
@@ -153,7 +153,7 @@ public final class Q00186_ContractExecution extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
index b1faecd5bd204c85fb89002aae39ca7a49462653..707f46783ed9adae3f01602d38cbceb4b80e3255 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
@@ -108,7 +108,7 @@ public final class Q00187_NikolasHeart extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
index e9edaf76b0d25438d07fd57f8b12dfbb6c3caa63..e71d658bbe26e18dc7e002ff0c49ae0d324f40e0 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
@@ -111,7 +111,7 @@ public final class Q00188_SealRemoval extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
index 0fbff40b6a890a50498a98473c043d8169b14027..aea7f3c631fbad098665a8793c14c930bd002e19 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
@@ -118,7 +118,7 @@ public final class Q00189_ContractCompletion extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
index e1bf74cedf21e2be1f307fd672d139be415935e9..7180781b0eb21695001d6ec57faa339b1d64b2bf 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
@@ -100,7 +100,7 @@ public final class Q00190_LostDream extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
index 4646c188740928e50b7a7e102a469b773fc8d277..e99b1cf3744cc40803a51a4ee5204846d973437f 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
@@ -119,7 +119,7 @@ public final class Q00191_VainConclusion extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
index 0661b4da453cee723423355c945ffe8de7dbded5..7b481a30222315f57ae5135da13c563698a473f8 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
@@ -154,7 +154,7 @@ public class Q00237_WindsOfChange extends Quest
public String onTalk(L2Npc npc, L2PcInstance talker)
{
String htmltext = getNoQuestMsg(talker);
- final QuestState st = talker.getQuestState(getName());
+ final QuestState st = getQuestState(talker, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
index 61134b67d6fcb2c3d754b1863f1440eb65639ded..57473cb429f5fd5bf67a0a1e17edb0486a83268e 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
@@ -140,7 +140,7 @@ public class Q00238_SuccessFailureOfBusiness extends Quest
public String onTalk(L2Npc npc, L2PcInstance talker)
{
String htmltext = getNoQuestMsg(talker);
- final QuestState st = talker.getQuestState(getName());
+ final QuestState st = getQuestState(talker, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
index 3556c09e49626cb8c0e229b88ca3152006adb8db..ab5471d11e729e3a20ea1d26c614d9076d47990f 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
@@ -140,7 +140,7 @@ public class Q00239_WontYouJoinUs extends Quest
public String onTalk(L2Npc npc, L2PcInstance talker)
{
String htmltext = getNoQuestMsg(talker);
- final QuestState st = talker.getQuestState(getName());
+ final QuestState st = getQuestState(talker, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
index 115538024b5f98412eac06c96b0d783a58d3601e..19a4cf177ba3d8fc7aa3eb7df47c569a6f0f14ff 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
@@ -108,7 +108,7 @@ public class Q00240_ImTheOnlyOneYouCanTrust extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java
index a096161a5dc8ae5abaf19f0dc20f9696bb49f58a..a5d0b52afcc6e11c5b69dfc165b4aa16e2f91a15 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java
@@ -262,7 +262,7 @@ public class Q00241_PossessorOfAPreciousSoul1 extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return getNoQuestMsg(player);
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java
index 9b53beda2735685944bf8ddf3d0d91cb7ac089be..4faf49f27aa6dfbdf32f2e6741e9bbcb05f4861c 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java
@@ -164,7 +164,7 @@ public class Q00242_PossessorOfAPreciousSoul2 extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java
index a35015156e232e6e0b4c046b8f0bd8689f32d1c6..88205a9c5788a7492ee3dc14406e3883595d1fc2 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java
@@ -254,7 +254,7 @@ public class Q00246_PossessorOfAPreciousSoul3 extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java
index 7bbebbeba4c7d1628ee4bd736d50865b07fcbf74..115dc6b0b3c82baec5a672ad8df854d5422c8166 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java
@@ -100,7 +100,7 @@ public class Q00247_PossessorOfAPreciousSoul4 extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00249_PoisonedPlainsOfTheLizardmen/Q00249_PoisonedPlainsOfTheLizardmen.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00249_PoisonedPlainsOfTheLizardmen/Q00249_PoisonedPlainsOfTheLizardmen.java
index 890d6d167401d71188935411204de2a29973e4f6..574197c3077869def89af92d64f92d9d03da8dd2 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00249_PoisonedPlainsOfTheLizardmen/Q00249_PoisonedPlainsOfTheLizardmen.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00249_PoisonedPlainsOfTheLizardmen/Q00249_PoisonedPlainsOfTheLizardmen.java
@@ -72,7 +72,7 @@ public class Q00249_PoisonedPlainsOfTheLizardmen extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00250_WatchWhatYouEat/Q00250_WatchWhatYouEat.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00250_WatchWhatYouEat/Q00250_WatchWhatYouEat.java
index d8129821fb00625b08de14867a3f0a0434f6f821..674be6c11d048fcd825d24a4fe6207103fd68307 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00250_WatchWhatYouEat/Q00250_WatchWhatYouEat.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00250_WatchWhatYouEat/Q00250_WatchWhatYouEat.java
@@ -145,7 +145,7 @@ public class Q00250_WatchWhatYouEat extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java
index 8efeb132a24ca0a8fe67295895d582f96725fa09..f75f55c6c40a9bd18305edd75c0030c46bdcc2e8 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java
@@ -118,7 +118,7 @@ public class Q00251_NoSecrets extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
index 3b23b3df5297a8aedcaa2de4119d35032e42c950..17537f737b8ead31919c9d8344bd0dbb6df1554a 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
@@ -105,7 +105,7 @@ public class Q00254_LegendaryTales extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
index b13b766cd7e7bb2fdd5d200919659f64af8160e1..a27ecf61e34383bd6438973cd9aaa47cc5960849 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
@@ -149,7 +149,7 @@ public final class Q00257_TheGuardIsBusy extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
index 53a904449574df01f17d8fa5b2b6db8a1aa05686..a7085fd54a75ea3cba5b780c3181dd97ff55ac7f 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
@@ -101,7 +101,7 @@ public final class Q00258_BringWolfPelts extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
index ca75edab9b93a0b9647c91027a3cf97c358ce41f..e9b730e8eff906267a7a1fd0099817aeaa97d598 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
@@ -139,7 +139,7 @@ public final class Q00259_RequestFromTheFarmOwner extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
index b87f22abf4c755de1a8161b5b2868dbe22e86820..d8594062029a3ccf9a0c8ad0d335ccff751d4c2f 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
@@ -113,7 +113,7 @@ public final class Q00260_OrcHunting extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
index cf95168414c144a60cde3476e56a9baa9ada67f8..25991e332818c3070e329172e0b5fb5854eabf1d 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
@@ -89,7 +89,7 @@ public final class Q00261_CollectorsDream extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
index 4881db92ed5eed7fa319bf1e9885bb18f71abebd..4eadabcf3a837c58a33de6f8090113bc30fcfcb3 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
@@ -102,7 +102,7 @@ public final class Q00262_TradeWithTheIvoryTower extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
index aa11e5a50880c9de12a928099102c712a9189f65..626eb79f61af6687f479c919f54e97b9d57ad151 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
@@ -110,7 +110,7 @@ public final class Q00263_OrcSubjugation extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
index c3aead8b316bbd760957f6e1683d31b9a0beb191..e01e13e9880ef250ae7e62e3caebdcb8f5316bf5 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
@@ -108,7 +108,7 @@ public final class Q00264_KeenClaws extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
index 0edc5ae2237bb0c1000dbdddc7fd71f599f13fdd..30b9d646d10982d4f84c64ea614e06289294967f 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
@@ -108,7 +108,7 @@ public final class Q00265_BondsOfSlavery extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
index 2d39d338d8486515afb8c5b7ec54c15f11725b1f..a50968c8b0d56bbce95f555e9ee79b7400aad1f4 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
@@ -109,7 +109,7 @@ public final class Q00266_PleasOfPixies extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
index 6d7098780658d3ea41b5b2fb388420ca42a84cda..8b26348419394fa95bc4441748eda88d71637f5f 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
@@ -98,7 +98,7 @@ public final class Q00267_WrathOfVerdure extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00268_TracesOfEvil/Q00268_TracesOfEvil.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00268_TracesOfEvil/Q00268_TracesOfEvil.java
index d5c56dfe4a5cd797de65ffecbde43e518956a513..c2611e6889a135a022de52574d907dac7e20a13e 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00268_TracesOfEvil/Q00268_TracesOfEvil.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00268_TracesOfEvil/Q00268_TracesOfEvil.java
@@ -88,7 +88,7 @@ public final class Q00268_TracesOfEvil extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00269_InventionAmbition/Q00269_InventionAmbition.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00269_InventionAmbition/Q00269_InventionAmbition.java
index 5c2728ccf283583d4c8f35449ff543ed068ac24a..3b1e5f79105e8fdbc209ea8361162d6fc389a294 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00269_InventionAmbition/Q00269_InventionAmbition.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00269_InventionAmbition/Q00269_InventionAmbition.java
@@ -114,7 +114,7 @@ public final class Q00269_InventionAmbition extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
index ed0ef8d15ad73090902474a43cadb887aa25dc79..233c932464bfb6c789ffe8dc292676ffeb022c00 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
@@ -337,7 +337,7 @@ public class Q00270_TheOneWhoEndsSilence extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
index a1e88688839c3c20b28dae81f76288d51a6f50dc..3f4c348aeff76b6d0ae81d91c000878d9800869a 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
@@ -90,7 +90,7 @@ public final class Q00271_ProofOfValor extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = null;
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
index 20de4994724325b32abe2d28f509d4c2169ff4a1..5a5ca1be1950cb86e9588e29a671b287fbddfd71 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
@@ -88,7 +88,7 @@ public final class Q00272_WrathOfAncestors extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = null;
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
index 5116cbfc0af32ae1d33b6cddd9414a49d85f4b11..e7cefa51d980962df4d88f1391797ea786803ed0 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
@@ -115,7 +115,7 @@ public final class Q00273_InvadersOfTheHolyLand extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = null;
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
index 1282c6e773a41bd5b4130f15c50fbc531f2ae1c0..3e897d5b95fa43f00c43c84469041ce424b6ed2a 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
@@ -95,7 +95,7 @@ public final class Q00274_SkirmishWithTheWerewolves extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
index 8eb9e3c8c7b7bbc7f9b7b82fb1118a84a970ff0e..14904a36bcf8bb3e3d27a63e34b6eafb244182b0 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
@@ -127,7 +127,7 @@ public final class Q00275_DarkWingedSpies extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance talker)
{
- final QuestState st = talker.getQuestState(getName());
+ final QuestState st = getQuestState(talker, true);
String htmltext = getNoQuestMsg(talker);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
index 7f80a266c0a965781da1c1ff33b0f0962db4d00f..2a3169815e4da65333bdaf2b44504a4d05500f72 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
@@ -131,7 +131,7 @@ public final class Q00276_TotemOfTheHestui extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
index 7b94922aa29a057dbf1ddb0dbfab4b41d36459b9..250a6fe47b2e5bd1b3df3749d4eacdcee8efc678 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
@@ -90,7 +90,7 @@ public class Q00277_GatekeepersOffering extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
index ba9c035b81e439c246890fb95afc82427fddc6e8..5643fc9fcf1a5f330f80f469851863875789b312 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
@@ -173,7 +173,7 @@ public class Q00278_HomeSecurity extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java
index 38258075aa452fe490a0c76c8b9a3ae0861e7029..6e6edfd827d30cb646638927f13209e65934ffda 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java
@@ -123,7 +123,7 @@ public final class Q00279_TargetOfOpportunity extends Quest
public final String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00280_TheFoodChain/Q00280_TheFoodChain.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00280_TheFoodChain/Q00280_TheFoodChain.java
index 0843e5ed8f760eadbd02b2379a021a7717ed8885..8a88566fb394fb52b43ed1539380aa32ae5f03dc 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00280_TheFoodChain/Q00280_TheFoodChain.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00280_TheFoodChain/Q00280_TheFoodChain.java
@@ -174,7 +174,7 @@ public final class Q00280_TheFoodChain extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance talker)
{
- final QuestState st = talker.getQuestState(getName());
+ final QuestState st = getQuestState(talker, true);
String htmltext = getNoQuestMsg(talker);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java
index 92676f47f56d22a089e7819ecefa009816b57828..b777b3d4b07fd5a2f66334dc018eaa3b0305bb86 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java
@@ -170,7 +170,7 @@ public final class Q00281_HeadForTheHills extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00283_TheFewTheProudTheBrave/Q00283_TheFewTheProudTheBrave.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00283_TheFewTheProudTheBrave/Q00283_TheFewTheProudTheBrave.java
index f644d8989cdfcc7ee86ebccb07d001d2ff06ae92..8ec9acc602399a4fbdca65dbbfdde7135b8de451 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00283_TheFewTheProudTheBrave/Q00283_TheFewTheProudTheBrave.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00283_TheFewTheProudTheBrave/Q00283_TheFewTheProudTheBrave.java
@@ -115,7 +115,7 @@ public final class Q00283_TheFewTheProudTheBrave extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance talker)
{
- final QuestState st = talker.getQuestState(getName());
+ final QuestState st = getQuestState(talker, true);
String htmltext = getNoQuestMsg(talker);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00287_FiguringItOut/Q00287_FiguringItOut.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00287_FiguringItOut/Q00287_FiguringItOut.java
index b0a1cc94c6333b756d218a9a749909abf7bcfa05..ebeb556112b1bf7c94648321af6f52a5b41d043d 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00287_FiguringItOut/Q00287_FiguringItOut.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00287_FiguringItOut/Q00287_FiguringItOut.java
@@ -182,7 +182,7 @@ public class Q00287_FiguringItOut extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
final QuestState prev = player.getQuestState(Q00250_WatchWhatYouEat.class.getSimpleName());
if (st == null)
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00288_HandleWithCare/Q00288_HandleWithCare.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00288_HandleWithCare/Q00288_HandleWithCare.java
index 6bfa210ab01de6daf52f375a5a00b700074d0f80..ad56d0104a5c2d5320861adf31cff66c4bb2dbcb 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00288_HandleWithCare/Q00288_HandleWithCare.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00288_HandleWithCare/Q00288_HandleWithCare.java
@@ -187,7 +187,7 @@ public class Q00288_HandleWithCare extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java
index 1fef495a37a579a5f1583253809e1fbcc14d50bf..9d80f19b4451d04a2aed2ac23a0b7d5fdf265ede 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java
@@ -237,7 +237,7 @@ public class Q00289_NoMoreSoupForYou extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java
index e779507e4a976aeda213e6061f497c19d18c07f5..743156d655b08ce34db51d687c0eaf4e1b0c9385 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java
@@ -197,7 +197,7 @@ public class Q00290_ThreatRemoval extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- QuestState st = player.getQuestState(getName());
+ QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
index 5763ad13154359053020b8dd6fbac4969610e3b6..d57e5e241803989019960f851a11db3199c4eae5 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
@@ -131,7 +131,7 @@ public final class Q00293_TheHiddenVeins extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
index 6def9756b4550ba4246f62f2325595b8756105ac..c85eb898bbb73ec3c5c334e0ea9c95956fdcb07d 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
@@ -90,7 +90,7 @@ public class Q00297_GatekeepersFavor extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
index 6f544b755d726e6aba8f2ae816fc7a47be956050..3ab35f7e292cef920a839243b712269c71d56ce4 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
@@ -145,7 +145,7 @@ public final class Q00300_HuntingLetoLizardman extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
index 0bf2836e21568fab2d89d4502548c3d182c1c74e..bc7a26acde3a1f39815bd35c901466d352cb5556 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
@@ -80,7 +80,7 @@ public final class Q00303_CollectArrowheads extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
index 5ade3b4007b5c8e64d76b8f03d2553c7477204b0..bb547a9013cacd036918715be2e07030ba019baf 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
@@ -126,7 +126,7 @@ public final class Q00306_CrystalOfFireAndIce extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java
index ec9e2cb3e926f0493eaee1c1ac7b74584f4e8782..b6f05b22e7dfee3c45340b8d74046853026fc431 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java
@@ -171,7 +171,7 @@ public class Q00307_ControlDeviceOfTheGiants extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java
index a1a1433858eff381cb8e06a483d85a7cad4171ef..351cf4b7cc7b29aabf4ffc687ef19a311ce448fe 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java
@@ -239,7 +239,7 @@ public class Q00308_ReedFieldMaintenance extends Quest
public String onTalk(L2Npc npc, L2PcInstance talker)
{
String htmltext = getNoQuestMsg(talker);
- final QuestState st = talker.getQuestState(getName());
+ final QuestState st = getQuestState(talker, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java
index 88784274669963abbf6ae7bccb0e803a44074f81..3a443ce40eb1943fb990d0db39c560cbda85ba99 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java
@@ -242,7 +242,7 @@ public class Q00309_ForAGoodCause extends Quest
public String onTalk(L2Npc npc, L2PcInstance talker)
{
String htmltext = getNoQuestMsg(talker);
- final QuestState st = talker.getQuestState(getName());
+ final QuestState st = getQuestState(talker, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
index 1c90135a3def509ad5a2998e2168c6f1b41a3ae6..30cbd4a555bb31946dec573a018f0fb97ab67e64 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
@@ -132,7 +132,7 @@ public class Q00310_OnlyWhatRemains extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java
index 8b5ce76b14f712c4f07acc2815024b958c4fee5d..10e07ac927bed90ca6b15e96110540367c14563b 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java
@@ -156,7 +156,7 @@ public final class Q00311_ExpulsionOfEvilSpirits extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState qs = getQuestState(player, false);
+ final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (qs == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java
index 38458f7dce565c4d92bc6008867700f216df8180..2d86999a6be83ad9583263be77a19564d79f40a8 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java
@@ -117,7 +117,7 @@ public class Q00312_TakeAdvantageOfTheCrisis extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
index 8c948b8c9f04e15fc8edc3b9da9ea72768f1189e..8be709859a948ff8e2a23f84ba9e08fbd4c875cf 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
@@ -97,7 +97,7 @@ public final class Q00313_CollectSpores extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
index dabf4666f8eca943b4aa5ac70fc9ce3ccbd509d9..5ec38e6a47991d6df7e0ec0694f77bede5249988 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
@@ -105,7 +105,7 @@ public class Q00319_ScentOfDeath extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return getNoQuestMsg(player);
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
index 61bf88afc0fba82495cdcf32e8a58851e8b55644..738cb7a805ce61041b62d325184c38e215467ab1 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
@@ -82,7 +82,7 @@ public final class Q00320_BonesTellTheFuture extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
index 382f8a453f124a3aab6263d7534ca9768811e3dd..0453e1d43ca31dc5a61bf45e1c6425f896b3cc33 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
@@ -79,7 +79,7 @@ public class Q00324_SweetestVenom extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
index 3db03f97a8f5bde0bb4a4efc09d241166221ee1c..b5222be2721c8b3cd91f563917b35dacdf7467c8 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
@@ -220,7 +220,7 @@ public final class Q00325_GrimCollector extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
index 3f1984b5ee59d11e1fc15d00943cbb315161d25a..5ed28e773549f1e8c5b79134b488fdd414c4bcc2 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
@@ -115,7 +115,7 @@ public final class Q00326_VanquishRemnants extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = null;
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
index 06db339beb004bc533938efeea26e62ac97b2e5e..46c2b872b79486672128599026fc3a359e0eedee 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
@@ -100,7 +100,7 @@ public class Q00328_SenseForBusiness extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
index 0644fc0497a30860b3fccf8a076715e6a56be44d..c3c7623dbbc8dde746144a470a7a2dc191601ae7 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
@@ -120,7 +120,7 @@ public final class Q00329_CuriosityOfADwarf extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
index a813ef4af4b91f92eac5f57cd5a7cf474c080e02..273f36920bcefa074e945d335b43eaa637bd5c43 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
@@ -99,7 +99,7 @@ public class Q00331_ArrowOfVengeance extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java
index 6c11e108ebe82f508831b7ada01dd3e818fcf81b..31b8087425e6dd732c8406a2fda0bac2bf4c90b0 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java
@@ -113,7 +113,7 @@ public class Q00338_AlligatorHunter extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
index 27405b4191a107967dbff89de65c940d80918a3c..830fa6ae3b6153d2050b1180309a5809e271168d 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
@@ -220,7 +220,7 @@ public class Q00350_EnhanceYourWeapon extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
index 7420e74aeae9aefb4b4c7c079300dc21a76baa52..319d6a77296b8b5cfaf71dd180f71218a570fb23 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
@@ -159,7 +159,7 @@ public final class Q00354_ConquestOfAlligatorIsland extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
index d91d1cf63e5412558df592f7c05fe315adfa4a2f..2539e0c0ef23bb0dae03f555f1939c4838b097c2 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
@@ -165,7 +165,7 @@ public final class Q00356_DigUpTheSeaOfSpores extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- QuestState qs = getQuestState(player, true);
+ final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (qs.isCreated())
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
index d03d64a050f55ac663a418b6f5cfcfcf610b597a..7c0d2e3ceda3b73cb27163af859df438b13f51f1 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
@@ -129,7 +129,7 @@ public final class Q00360_PlunderTheirSupplies extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java
index b3324dc4fe17fa779dc77ffd87551a0fa81f0cb8..25fbeb4ee481b72c5f31d41bd7add3e563830bd3 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java
@@ -120,7 +120,7 @@ public final class Q00368_TrespassingIntoTheHolyGround extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00423_TakeYourBestShot/Q00423_TakeYourBestShot.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00423_TakeYourBestShot/Q00423_TakeYourBestShot.java
index 7441871dbfb95dfe0ced7caaa32695e6f319868d..f12f1fede2b0d318486bb5f6084b56d46eecfeb6 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00423_TakeYourBestShot/Q00423_TakeYourBestShot.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00423_TakeYourBestShot/Q00423_TakeYourBestShot.java
@@ -109,7 +109,7 @@ public class Q00423_TakeYourBestShot extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
index 191fe1762be6f86dfab36f362b73fc28a3c62127..63acf90c25ebdb390109b47661dea79bca2cf588 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
@@ -111,7 +111,7 @@ public class Q00431_WeddingMarch extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
index 432d90f592560f293053730f53b1732b2a812cc1..b820ddb8b3f3c863ac73f57e5aff08987ebbb43d 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
@@ -106,7 +106,7 @@ public class Q00432_BirthdayPartySong extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
index 3b36be3dfa999e6f4e900710a6170bacdecf3eae..5b22a68ad6c350e443ac12de9567756d952997d9 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
@@ -92,7 +92,7 @@ public class Q00450_GraveRobberRescue extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
index 026a4ef9085fbd176745a485ad6b6cf6014fc933..4c86599b23e86a5b991834d8386dbcbf55838458 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
@@ -87,7 +87,7 @@ public class Q00451_LuciensAltar extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
index e41c508e14f2fd7393f9da18b1a75bf2fb66bf9a..4068793bb7e401a9c39177794c66e993bae87ebe 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
@@ -96,7 +96,7 @@ public class Q00452_FindingtheLostSoldiers extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
index ab1b65235db68bae1b4cacacf747386440251779..7e07bdb5f2a5f4f88c0570f9261b79660f1d7280 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
@@ -268,7 +268,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
QuestState prev = player.getQuestState(Q10282_ToTheSeedOfAnnihilation.class.getSimpleName());
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
index 4bc6622d13e51af7635d36fd6b74202b7412fb6b..98bc49aecb2f889d78703fdbea9c1a7598382c7f 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
@@ -133,7 +133,7 @@ public class Q00455_WingsOfSand extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return getNoQuestMsg(player);
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
index f8811412af1e9fd0d741da57052b5714a066b592..199224ec300f6f749df3a8e65414955a0f52b5b6 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
@@ -184,7 +184,7 @@ public final class Q00456_DontKnowDontCare extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState qs = player.getQuestState(getName());
+ final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (qs == null)
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
index 5b7da60d0a86c55f10545c34e5d352059099fdb7..039145e7d552bc9d90fdfa6232fde185f3b61587 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
@@ -207,7 +207,7 @@ public final class Q00457_LostAndFound extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(getName());
+ QuestState st = getQuestState(player, true);
if (st == null)
{
st = newQuestState(player);
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
index 22d46d532b8e83e3b6f3a37eea3c800cce1a71e3..09df5d76d271bc5ba4b13143e5b54c915f5b473d 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
@@ -285,7 +285,7 @@ public class Q00458_PerfectForm extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java
index 3d70524518acd5831d751ff49b89d0a83fc15845..90c617ed23b11917f647af834df492eea92c712e 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java
@@ -135,7 +135,7 @@ public class Q00461_RumbleInTheBase extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java
index 58786e22cd995d9f5d9bccb4e19fa98c78b97618..5c0bf66d3e7fa2eedc31dff570f8c01fc2551b4c 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java
@@ -208,7 +208,7 @@ public class Q00463_IMustBeaGenius extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
index 28c0bedcd322be6c801606f6b1845187643ecc74..5fbea0fb1cbe4db1e509a2af3877878eb81cc39d 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
@@ -222,7 +222,7 @@ public class Q00464_Oath extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if ((st != null) && st.isStarted())
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java
index 6cd8535ae9d64720018018c4fc4a29cd8cadc323..e38089ed8de4e3c1fec30bc14ca88a3745a2cb69 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java
@@ -107,7 +107,7 @@ public final class Q00504_CompetitionForTheBanditStronghold extends Quest
@Override
public final String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return getNoQuestMsg(player);
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
index 47504ad51757e0eab464eaf608942b1cb8c11cf8..6761f86b2ddc1b828af50f5f42e2b2fd9f0e4c71 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
@@ -161,7 +161,7 @@ public class Q00508_AClansReputation extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
index d6db4b7980bfb3b44bc80fc303aa0cbeb5a1902c..5a7533437dcaa33a223d6a0df4fdea948fe21172 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
@@ -148,7 +148,7 @@ public class Q00509_AClansFame extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
index 65501631592c10f03422c32e652b5879d54387cf..7fe7fdc1e245f3ce165fb0d6bff4a079f98d75ff 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
@@ -110,7 +110,7 @@ public class Q00510_AClansPrestige extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
index 7e1c86123929d0959137d96fd5a365c8182325df..6220c7eb4db82229542ed50163691d1f6e7e11cc 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
@@ -417,7 +417,7 @@ public final class Q00511_AwlUnderFoot extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = Quest.getNoQuestMsg(player);
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String ret = checkFortCondition(player, npc, false);
if (ret != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
index 466b4b0637ad5d9f1a74e7d8bf6762354cff4180..430e1ba4d1ad40a49194aa77cfafc927f7610b6b 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
@@ -202,7 +202,7 @@ public class Q00551_OlympiadStarter extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00552_OlympiadVeteran/Q00552_OlympiadVeteran.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00552_OlympiadVeteran/Q00552_OlympiadVeteran.java
index bb6e9447048084f547124d0791a327b0a1d96b2d..176d58f34b0052e2245d8bd0e17fd95b16be2c24 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00552_OlympiadVeteran/Q00552_OlympiadVeteran.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00552_OlympiadVeteran/Q00552_OlympiadVeteran.java
@@ -186,7 +186,7 @@ public class Q00552_OlympiadVeteran extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
index 60aba7d9c9f44016e8ee7479c525647bc817d8e1..d1356f9a02751f84a0b3a99b4c57ddf363bd6c4c 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
@@ -152,7 +152,7 @@ public class Q00553_OlympiadUndefeated extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java
index fcbb6edf8745dc686246e003f876d1c445d219e1..abc6c90c1d05265b84b7e99cae1cee7cd4008974 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java
@@ -143,7 +143,7 @@ public class Q00601_WatchingEyes extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java
index f9c6e294b4cdf591bd7fd5ca3ade2d53ed9c0e47..ee2203fc721fcdc17ee118507263727db0657060 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java
@@ -150,7 +150,7 @@ public class Q00602_ShadowOfLight extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java
index 42de5cf0a65243f211f2c119a4adc8d34f2036f1..638e00536fc52d016b58abb1fdee6ac7a6ab912a 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java
@@ -283,7 +283,7 @@ public class Q00605_AllianceWithKetraOrcs extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java
index 91be441baef7a50f7baee738663bf21a478f9d4d..2716c40c7d4435a339ed05ee0b13a7ecb526c59c 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java
@@ -124,7 +124,7 @@ public class Q00606_BattleAgainstVarkaSilenos extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java
index 1a36b4c865ea886717c0fd25c6045dc7f43fef60..17fd77843d336ab17c910689d45e7a8bc1d6d476 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java
@@ -107,7 +107,7 @@ public class Q00607_ProveYourCourageKetra extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java
index 423188e5e9292ab784dba2bb881b65313e66a7ac..8a113e1d97cffc0201e0f1d3e92b76820ebc538e 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java
@@ -107,7 +107,7 @@ public class Q00608_SlayTheEnemyCommanderKetra extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java
index 84e377f3abfacd85fe68a1113601e2613d1f8e51..26e544431fbf4d0e5e01464cb2c5741014710291 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java
@@ -156,7 +156,7 @@ public class Q00609_MagicalPowerOfWaterPart1 extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java
index 97f43862b6a3bd993140dbf4e17d8de9ff9fcc0e..ad1c217e87192e3c84f99b1e7a16f078a51f2c19 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java
@@ -158,7 +158,7 @@ public class Q00610_MagicalPowerOfWaterPart2 extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java
index 72f71bf9be1c19ae0f586be215e07361c7dcf1b4..d8f685d3576e12eb4d0e66ccda5b8d1617d685c2 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java
@@ -283,7 +283,7 @@ public class Q00611_AllianceWithVarkaSilenos extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java
index aea47aa22a32b4764dbcba1e1cbeb28eaf839422..19ca70ff1906ca2ee48d7db9f7f5b98d6316e6c5 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java
@@ -124,7 +124,7 @@ public class Q00612_BattleAgainstKetraOrcs extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java
index 5467bae16b3c0ff8491b67ccbbf9b2ed10ec639f..c11708d77fbe9bfe1e736c73aef4e007c87f8907 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java
@@ -107,7 +107,7 @@ public class Q00613_ProveYourCourageVarka extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java
index 39be548a2bc47c5c7d487857a469242d2daae387..ca17ff43e00e7cb3b1f84a6d24b368e61c91c22c 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java
@@ -107,7 +107,7 @@ public class Q00614_SlayTheEnemyCommanderVarka extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java
index 1a53d38d752c0eba273482c70d4fb7bb8ffc4276..71dc426c2eb3ad60831f3b530e52c9a9a012eaea 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java
@@ -156,7 +156,7 @@ public class Q00615_MagicalPowerOfFirePart1 extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java
index e85bfada56c6186d9382591a90de6fec000ab71f..1edafc9dff70b0e3c2cffa511ca03940f10e3c19 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java
@@ -158,7 +158,7 @@ public class Q00616_MagicalPowerOfFirePart2 extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
index 8c8981fe33875231ff732cf0449dc717c717861a..8fd1a35409343eaf760ec2a92fa10d0982d7f186 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
@@ -177,7 +177,7 @@ public class Q00617_GatherTheFlames extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
index 499f5b24f83df8149dbc47a18a6c3792ae6c8db1..8000cebd4d701228548787a1e06ca7953578b3d2 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
@@ -144,7 +144,7 @@ public class Q00618_IntoTheFlame extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java
index 768719c3f38c71497149d2db853a005ce37fe1e2..897a587dcd2d49b20d19d8e79a40a96b42a3de08 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java
@@ -306,7 +306,7 @@ public final class Q00619_RelicsOfTheOldEmpire extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java
index 65a53b71b03e3d48e2b4ba9127e8a6389660b596..83565e78ee099b8e6cac782447aa4ab978878b33 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java
@@ -130,7 +130,7 @@ public final class Q00624_TheFinestIngredientsPart1 extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java
index 2bfbc5d98d708ec4ead44558a63da802359e4e54..eb7ea88a1061ad4f6bbb0f43637b195f1ce207b4 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java
@@ -145,7 +145,7 @@ public class Q00626_ADarkTwilight extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
index 4d7a51f9babdf7e131bba855f70d86ab3cdd16b6..7c70f052efcc3dd286af53726b665c9c6b3a90af 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
@@ -185,7 +185,7 @@ public class Q00627_HeartInSearchOfPower extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
index 1875ab906cd2be09a85db5907787b0a631afee8a..e9adc34e7328584de3759e29af36c39392141cc5 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
@@ -200,7 +200,7 @@ public class Q00631_DeliciousTopChoiceMeat extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java
index daae27eafed80763a1a794411c01a0a4fe2e78f6..01b19241173b593dff082a2b6e640aaa3c170f9b 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java
@@ -172,7 +172,7 @@ public final class Q00634_InSearchOfFragmentsOfDimension extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- QuestState qs = getQuestState(player, true);
+ final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (qs.isCreated())
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00636_TruthBeyond/Q00636_TruthBeyond.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00636_TruthBeyond/Q00636_TruthBeyond.java
index a3690b8845558bc0409fb801d00f9db37a7e5e99..0a957e844a48c09a0094536485f6d25337537ae8 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00636_TruthBeyond/Q00636_TruthBeyond.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00636_TruthBeyond/Q00636_TruthBeyond.java
@@ -86,7 +86,7 @@ public final class Q00636_TruthBeyond extends Quest
@Override
public final String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return getNoQuestMsg(player);
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java
index 585380f44b857248d2a09cb47bb7754f68e4f28f..5321805bc3205fa8ed216bfeae66cf7517b63910 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java
@@ -114,7 +114,7 @@ public final class Q00637_ThroughOnceMore extends Quest
@Override
public final String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return getNoQuestMsg(player);
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/Q00639_GuardiansOfTheHolyGrail.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/Q00639_GuardiansOfTheHolyGrail.java
index d4459cf33620a66b82b41f0d364d6196fa65fa4c..8db89994476917ddc4bf0659f8b2f95aeeae30e9 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/Q00639_GuardiansOfTheHolyGrail.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/Q00639_GuardiansOfTheHolyGrail.java
@@ -39,7 +39,7 @@ public final class Q00639_GuardiansOfTheHolyGrail extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st != null)
{
st.exitQuest(true);
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
index 41a3d019374b20c1a25e07c785c37f6cb3d32dc5..f6c3e57367d5dd8c477cc5d0d5b6102f70050695 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
@@ -110,7 +110,7 @@ public class Q00641_AttackSailren extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(getName());
+ QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
index 031a375f99c639f794ddc381f75a3072c013226d..5873666fae113797d9e71456d6b881608aad5fdc 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
@@ -142,7 +142,7 @@ public class Q00642_APowerfulPrimevalCreature extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
index 8ada891fad2bd22162a85d56e31c1da6b5786790..2e504de26189eb4e68ef1983a7d9cccb5f32fd10 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
@@ -232,7 +232,7 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java
index 46a5801af71bc4767d506a236c01f14a58b49386..0b2fbbff15ae785caea694bce476cb85674f57be 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java
@@ -134,7 +134,7 @@ public final class Q00644_GraveRobberAnnihilation extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
index c942d0b282282234cef503a23cbcf59dedb5d4d9..dcb3e65327485de6fec11ff217b4ca64563b7fa6 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
@@ -122,7 +122,7 @@ public class Q00645_GhostsOfBatur extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return getNoQuestMsg(player);
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00646_SignsOfRevolt/Q00646_SignsOfRevolt.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00646_SignsOfRevolt/Q00646_SignsOfRevolt.java
index d018efaa8e2701f80ac5fffb2d93e62215402720..fa93040d1693485e4755cb89bb0120ed57dd75b8 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00646_SignsOfRevolt/Q00646_SignsOfRevolt.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00646_SignsOfRevolt/Q00646_SignsOfRevolt.java
@@ -45,7 +45,7 @@ public class Q00646_SignsOfRevolt extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st != null)
{
st.exitQuest(true);
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java
index 062c46f1581ca560049634e2c044bcb67bddbc49..95e4125bae1fb1e05aa12e4ef0959e20ca0cde1b 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java
@@ -140,7 +140,7 @@ public class Q00647_InfluxOfMachines extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java
index f609ca693c3b049ff8c8f48550cb4bbb7b7475f1..1e49ba590f42b1fcb8f4a3d81dd3429abfe85635 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java
@@ -102,7 +102,7 @@ public final class Q00649_ALooterAndARailroadMan extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java
index 9aac37cb9383be0d4e9bf4934769c654df800a28..e5eb47cc84d166f5517232dc33a651c325ec4a52 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java
@@ -107,7 +107,7 @@ public final class Q00650_ABrokenDream extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java
index cc7f9302fdaf59f382d33b7e74eaa2ecacc820cb..54abb4de4fb24d3b556833ce6512be9111f9a0e2 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java
@@ -77,7 +77,7 @@ public class Q00651_RunawayYouth extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java
index 1fa404a91ec88649fab39ed7188940a2c7fed745..ec40909926f536c871b874893df71b9f53b52b62 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java
@@ -77,7 +77,7 @@ public class Q00652_AnAgedExAdventurer extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java
index 99bc3dbe073bf5b74b89befb3b7d78c41cba046f..2934d97b862b3cae46551f11d33ebe2349e358c3 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java
@@ -77,7 +77,7 @@ public class Q00653_WildMaiden extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java
index 08704b0d76d351d61c93bcbab51912a371bf9944..e6f9e04392628693df9a10847096f1581e5c73ac 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java
@@ -121,7 +121,7 @@ public final class Q00659_IdRatherBeCollectingFairyBreath extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
index 109ae18cd51abf4344239832fdba14e58ab33063..4c7c5a4eb46e48986981c98430bfa809220fb355 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
@@ -611,7 +611,7 @@ public final class Q00662_AGameOfCards extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
index cac068dc3a713ca886f4e9df52fb08f3780654b4..36cb14a3a514733c5ae39346fbd2988deaa92941 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
@@ -143,7 +143,7 @@ public class Q00688_DefeatTheElrokianRaiders extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java
index 0f16300e11424462ea482cd3d9e795ad1ffb187e..af004b84e68cfc19071a0f67f667301e5d898fb7 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java
@@ -160,7 +160,7 @@ public class Q00690_JudesRequest extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java
index 30fef01a5d7e7bfa16dea0daf6fc757f8f4eb235..1a24030f132dc1deb07646ba836729c06392d70c 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java
@@ -150,7 +150,7 @@ public final class Q00691_MatrasSuspiciousRequest extends Quest
public final String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java
index 9565f50f2924fa8eeb02106d438078596810fec3..9a8b2dcff59c8617f32c58a133703ad6eece721a 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java
@@ -203,7 +203,7 @@ public final class Q00692_HowtoOpposeEvil extends Quest
public final String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java
index 24d581f5ecd71bd4ee005c660586baa70372e4fb..2f449ca71fa651bd3bb4ec82da7d65d7b7bf8c8a 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java
@@ -140,7 +140,7 @@ public class Q00699_GuardianOfTheSkies extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- QuestState st = player.getQuestState(getName());
+ QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java
index ec880ffac8a302d08807baf4d1192e9af70b68c9..e047376102322b483eb1b91a76786bc6def7f1a8 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java
@@ -114,7 +114,7 @@ public class Q00700_CursedLife extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st != null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java
index 8f6bf1be6bd54a10c44cd89e42c1e43923412760..a895e166594e505ac86a8058c588b65b64d2e901 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java
@@ -141,7 +141,7 @@ public class Q00701_ProofOfExistence extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java
index 647b1f163684eadf9fd0c25d9043ff52a163af9f..040c36a5c93987f619eb133769879b9221a783e5 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java
@@ -365,7 +365,7 @@ public class Q00702_ATrapForRevenge extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
index f2ed131e1ad6bc4253f57bf1971e24998f1297a9..255001ab48f3ce0629bce5f0c1721c8a88283753 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
@@ -132,7 +132,7 @@ public class Q00901_HowLavasaurusesAreMade extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
index 987a08b62ac93c3f303a05b9dbf8f3a79fdd9ccf..ee775cc9331c6dfb59b2492a1a9146c7da74dff2 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
@@ -169,7 +169,7 @@ public final class Q00902_ReclaimOurEra extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
index 2e6857af81b053fcc4e6349048151eadd9fe8978..88e5069455913f27942ef158a79e19689d85b27a 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
@@ -124,7 +124,7 @@ public class Q00903_TheCallOfAntharas extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return getNoQuestMsg(player);
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
index 320564317d817e67fe8c60712b60d66d21ef64db..c9afee08ed02e81c525bf32a48e1d48c8ea448e5 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
@@ -162,7 +162,7 @@ public final class Q00905_RefinedDragonBlood extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return getNoQuestMsg(player);
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
index cf262fe99caa182e5cacfcf1805059c0a4d810fb..92ee6c9fbca9f1884453758d1e5323eaa614c606 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
@@ -105,7 +105,7 @@ public class Q00906_TheCallOfValakas extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return getNoQuestMsg(player);
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java
index ed432b27346d2580de3bd9ee93b2d0e6f6d3c5ce..67c3c920229e8a4e8fb9b2807a49f57639c835a6 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java
@@ -102,7 +102,7 @@ public class Q00907_DragonTrophyValakas extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return getNoQuestMsg(player);
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00998_FallenAngelSelect/Q00998_FallenAngelSelect.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00998_FallenAngelSelect/Q00998_FallenAngelSelect.java
index c8bb0409108e8041f8646aa438a883502001fbdc..a0b2eada04b3841fbd72d10a029167d84546dc1e 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00998_FallenAngelSelect/Q00998_FallenAngelSelect.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00998_FallenAngelSelect/Q00998_FallenAngelSelect.java
@@ -88,7 +88,7 @@ public class Q00998_FallenAngelSelect extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
final QuestState qs = player.getQuestState(Q00141_ShadowFoxPart3.class.getSimpleName());
if ((st == null) || !st.isStarted())
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java b/L2J_DataPack/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java
index f1ef17163816733b46b12f361f90d4e1766079f9..158faab44b8ccf2869201eee52c60178471eac07 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java
@@ -77,7 +77,7 @@ public class Q10267_JourneyToGracia extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java b/L2J_DataPack/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java
index 31a71b187b5c749342e14ad8ed7c4ddfc18eaa24..07e1336d947fdc8f5d74a473fe47736a4afbf5a9 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java
@@ -66,7 +66,7 @@ public class Q10268_ToTheSeedOfInfinity extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java b/L2J_DataPack/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java
index 5f411240862f6c7781ee3a2406ff8fa329452ee0..b745dd75efc76998000d906c93e642d09d460d5a 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java
@@ -66,7 +66,7 @@ public class Q10269_ToTheSeedOfDestruction extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java b/L2J_DataPack/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java
index f4468f41a3108fbaebd4ca9f391c8817f9914fa4..d41cf92fe534b7c861b0497c4307096043fcc548 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java
@@ -79,7 +79,7 @@ public class Q10271_TheEnvelopingDarkness extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(getName());
+ QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java b/L2J_DataPack/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
index a94f2eac0cc158c9ae94143de0f9d1ebfa89fd75..d701076f948bb0c579e05c6666caefbc83e05932 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
@@ -177,7 +177,7 @@ public class Q10272_LightFragment extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(getName());
+ QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java b/L2J_DataPack/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
index 23f1de0c6d154f4bd5cc591dfc530d738522093f..0db3e40f1df1f54dc97aa6fbde0939650a1c065e 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
@@ -123,7 +123,7 @@ public class Q10273_GoodDayToFly extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java b/L2J_DataPack/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
index 23ed0a7a742b825ab2f207816f72234b5b8d2e90..0cd1eba7eab6073bed39c359f6dd6614126f3a11 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
@@ -122,7 +122,7 @@ public class Q10274_CollectingInTheAir extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(getName());
+ QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java b/L2J_DataPack/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
index 4e1e1f3f88f999a0720e60a603b907105d1c73de..2ab6dd4db458bcca550a7585ae7fed9fe7abf780 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
@@ -178,7 +178,7 @@ public class Q10275_ContainingTheAttributePower extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java b/L2J_DataPack/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java
index b2dcb1876e69569ec35e3d1bdebb85fa0cdb9281..faf62de8f02da4e8d9ce24154df6502872418614 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java
@@ -113,7 +113,7 @@ public class Q10276_MutatedKaneusGludio extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java b/L2J_DataPack/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java
index 4909d143e0ef843eb1f9dc013141d032e1506ec3..56ca2bf9c39c2cef8947fa5d75127ff547e787f5 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java
@@ -113,7 +113,7 @@ public class Q10277_MutatedKaneusDion extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java b/L2J_DataPack/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java
index 65bb0c1cc0957352824dc13023024673399c6cf9..c627489589309e6b119d5259a19efe1ec7a6b95c 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java
@@ -113,7 +113,7 @@ public class Q10278_MutatedKaneusHeine extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java b/L2J_DataPack/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java
index c2074fd9970dfe631d6787b549f4e2d4888010ee..2b23fe410ba7c3026df5c3c0670952e797d0db79 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java
@@ -113,7 +113,7 @@ public class Q10279_MutatedKaneusOren extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java b/L2J_DataPack/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java
index de904b4d2a167e8ef1598d4c0ea8dd7a36e193fc..cd2891a34a73488c597cc90944651645e401ff20 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java
@@ -113,7 +113,7 @@ public class Q10280_MutatedKaneusSchuttgart extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java b/L2J_DataPack/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
index 8eacc712fc217a2d259dc0da73053a7c2ba3c14c..dd57d0d7688c9319ca4b408d0208b89b4eb398a0 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
@@ -111,7 +111,7 @@ public class Q10281_MutatedKaneusRune extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java b/L2J_DataPack/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
index f08f00964fa81ab26c2be4b218ab1db0fa2596d1..0ffd04bbfd68b3b869cd1f106c9a067e306fed3c 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
@@ -73,7 +73,7 @@ public class Q10282_ToTheSeedOfAnnihilation extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java b/L2J_DataPack/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
index 170592e7e43e40a11e4d37eb50f89996252ae0c7..e9a9c2ca7ee636a7c5823d484ae69e33bbc77138 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
@@ -124,7 +124,7 @@ public class Q10283_RequestOfIceMerchant extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java b/L2J_DataPack/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
index 6776b13093af4037f557ca7c724716d40cc12419..bd8ede3ea1d8bc76700af2998758f9ae54071c65 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
@@ -112,7 +112,7 @@ public class Q10288_SecretMission extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java b/L2J_DataPack/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
index be3e9eb68bdbb537385e06c5ac96c125fda8d874..f54e5045a0998cf0cca8bfc3d32f702a5315b6d5 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
@@ -111,7 +111,7 @@ public class Q10291_FireDragonDestroyer extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java b/L2J_DataPack/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
index 7ce3390c08eba88e1d7f7d13ea51ba4e3b1c2ce6..be96bcde87a52a0e151d4c575a7c9a8ae7490a7e 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
@@ -95,7 +95,7 @@ public class Q10501_ZakenEmbroideredSoulCloak extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return getNoQuestMsg(player);
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java b/L2J_DataPack/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
index cfec70b038166d7793d5b54204353cd54bd102e2..b0b7bdc8c85c26240946f1ef8e1199562cc8f1e4 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
@@ -95,7 +95,7 @@ public class Q10502_FreyaEmbroideredSoulCloak extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return getNoQuestMsg(player);
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java b/L2J_DataPack/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
index 132878de91bb15e785f9074c6a21fabcdc964807..9a9c82e71f9edef93982d89c1b1fabd84ec3266a 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
@@ -96,7 +96,7 @@ public class Q10503_FrintezzaEmbroideredSoulCloak extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, true);
if (st == null)
{
return getNoQuestMsg(player);
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java b/L2J_DataPack/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
index 472e579b239369a242dae8a1c23bb00172fcfb54..48a79f8e15c758bf454a39ee45e9cfe768f0f973 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
@@ -108,7 +108,7 @@ public class Q10505_JewelOfValakas extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ QuestState st = getQuestState(player, true);
if (st == null)
{
return getNoQuestMsg(player);