Some QuestState changes :

- Update Village Master jython script to create a QuestState in onTalk following L2J/L2J_Server@ac426d90c3f02bb4f1916f1d23314c365c306907
- Updating all use L2PcInstance#getQuestState to use the helper from Quest when possible

L2J_DataPack/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java

@@ -57,7 +57,7 @@ public final class BlackMarketeerOfMammon extends AbstractNpcAI
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = event;
-		QuestState qs = player.getQuestState(getName());
+		final QuestState qs = getQuestState(player, false);
 		if ("exchange".equals(event))
 		{
 			if (exchangeAvailable())

L2J_DataPack/dist/game/data/scripts/ai/npc/SubclassCertification/SubclassCertification.java

@@ -173,7 +173,7 @@ public final class SubclassCertification extends AbstractNpcAI
 	@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)
 		{
@@ -187,7 +187,7 @@ public final class SubclassCertification extends AbstractNpcAI
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = null;
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return htmltext;

L2J_DataPack/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java

@@ -69,12 +69,7 @@ public final class GrandBossTeleporters extends AbstractNpcAI
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = "";
-		QuestState st = player.getQuestState(getName());
-		
-		if (st == null)
-		{
-			st = newQuestState(player);
-		}
+		QuestState st = getQuestState(player, false);
 		
 		if (st.hasQuestItems(VACUALITE_FLOATING_STONE))
 		{
@@ -92,7 +87,7 @@ public final class GrandBossTeleporters extends AbstractNpcAI
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = "";
-		QuestState st = player.getQuestState(getName());
+		QuestState st = getQuestState(player, true);
 		
 		if (st == null)
 		{

L2J_DataPack/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/OracleTeleport.java

@@ -158,7 +158,7 @@ public final class OracleTeleport extends AbstractNpcAI
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = "";
-		QuestState st = player.getQuestState(getName());
+		QuestState st = getQuestState(player, false);
 		
 		int npcId = npc.getId();
 		if (event.equalsIgnoreCase("Return"))
@@ -273,7 +273,7 @@ public final class OracleTeleport extends AbstractNpcAI
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = "";
-		QuestState st = player.getQuestState(getName());
+		QuestState st = getQuestState(player, true);
 		
 		int npcId = npc.getId();
 		if (Util.contains(TOWN_DAWN, npcId))

L2J_DataPack/dist/game/data/scripts/custom/NewbieCoupons/NewbieCoupons.java

@@ -79,7 +79,7 @@ public final class NewbieCoupons extends Quest
 			return htmltext;
 		}
 		
-		QuestState st = player.getQuestState(getName());
+		QuestState st = getQuestState(player, false);
 		int newbie = player.getNewbie();
 		int level = player.getLevel();
 		int occupation_level = player.getClassId().level();
@@ -154,11 +154,7 @@ public final class NewbieCoupons extends Quest
 	@Override
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
-		QuestState st = player.getQuestState(getName());
-		if (st == null)
-		{
-			st = newQuestState(player);
-		}
+		getQuestState(player, true);
 		
 		return "30598.htm";
 	}

L2J_DataPack/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java

@@ -273,7 +273,7 @@ public final class NpcLocationInfo extends Quest
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = event;
-		QuestState st = player.getQuestState(getName());
+		QuestState st = getQuestState(player, false);
 		
 		if (st == null)
 		{
@@ -308,6 +308,7 @@ public final class NpcLocationInfo extends Quest
 	{
 		String htmltext = getNoQuestMsg(player);
 		int npcId = npc.getId();
+		getQuestState(player, true);
 		
 		if (Util.contains(NPC, npcId))
 		{

L2J_DataPack/dist/game/data/scripts/custom/events/Race/Race.java

@@ -140,14 +140,7 @@ public final class Race extends Event
 		Announcements.getInstance().announceToAll("Visit Event Manager in Dion village and signup, you have " + _time_register + " min before Race Start...");
 		
 		// Schedule Event end
-		_eventTask = ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				StartRace();
-			}
-		}, _time_register * 60 * 1000);
+		_eventTask = ThreadPoolManager.getInstance().scheduleGeneral(() -> StartRace(), _time_register * 60 * 1000);
 		
 		return true;
 		
@@ -190,14 +183,7 @@ public final class Race extends Event
 			}
 		}
 		// Schedule timeup for Race
-		_eventTask = ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				timeUp();
-			}
-		}, _time_race * 60 * 1000);
+		_eventTask = ThreadPoolManager.getInstance().scheduleGeneral(() -> timeUp(), _time_race * 60 * 1000);
 	}
 	
 	@Override
@@ -290,7 +276,7 @@ public final class Race extends Event
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = event;
-		QuestState st = player.getQuestState(getName());
+		QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return null;
@@ -344,11 +330,8 @@ public final class Race extends Event
 	@Override
 	public String onFirstTalk(L2Npc npc, L2PcInstance player)
 	{
-		QuestState st = player.getQuestState(getName());
-		if (st == null)
-		{
-			st = newQuestState(player);
-		}
+		getQuestState(player, true);
+		
 		if (npc.getId() == _start_npc)
 		{
 			if (_isRaceStarted)

L2J_DataPack/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java

@@ -71,7 +71,7 @@ public final class CharacterBirthday extends Quest
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = event;
-		QuestState st = player.getQuestState(getName());
+		QuestState st = getQuestState(player, false);
 		
 		if (event.equalsIgnoreCase("despawn_npc"))
 		{
@@ -108,11 +108,7 @@ public final class CharacterBirthday extends Quest
 			return "busy.htm";
 		}
 		
-		QuestState st = player.getQuestState(getName());
-		if (st == null)
-		{
-			st = newQuestState(player);
-		}
+		QuestState st = getQuestState(player, true);
 		
 		if (!Util.checkIfInRange(10, npc, player, true))
 		{

L2J_DataPack/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java

@@ -79,7 +79,7 @@ public final class FreyaCelebration extends LongTimeEvent
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		QuestState st = player.getQuestState(getName());
+		QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return null;
@@ -156,10 +156,7 @@ public final class FreyaCelebration extends LongTimeEvent
 	@Override
 	public String onFirstTalk(L2Npc npc, L2PcInstance player)
 	{
-		if (player.getQuestState(getName()) == null)
-		{
-			newQuestState(player);
-		}
+		getQuestState(player, true);
 		return "13296.htm";
 	}
 	

L2J_DataPack/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java

@@ -92,7 +92,7 @@ public final class GiftOfVitality extends LongTimeEvent
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = event;
-		QuestState st = player.getQuestState(getName());
+		QuestState st = getQuestState(player, false);
 		
 		switch (event)
 		{

L2J_DataPack/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java

@@ -65,7 +65,7 @@ public final class HeavyMedal extends LongTimeEvent
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return getNoQuestMsg(player);

L2J_DataPack/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java

@@ -55,7 +55,7 @@ public final class LoveYourGatekeeper extends LongTimeEvent
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return getNoQuestMsg(player);

L2J_DataPack/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java

@@ -80,7 +80,7 @@ public final class MasterOfEnchanting extends LongTimeEvent
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = event;
-		QuestState st = player.getQuestState(getName());
+		QuestState st = getQuestState(player, false);
 		if (event.equalsIgnoreCase("buy_staff"))
 		{
 			if (!st.hasQuestItems(MASTER_YOGI_STAFF) && (st.getQuestItemsCount(Inventory.ADENA_ID) > STAFF_PRICE))

L2J_DataPack/dist/game/data/scripts/events/TheValentineEvent/TheValentineEvent.java

@@ -47,7 +47,7 @@ public final class TheValentineEvent extends LongTimeEvent
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return getNoQuestMsg(player);

L2J_DataPack/dist/game/data/scripts/gracia/instances/SeedOfDestruction/Stage1.java

@@ -56,7 +56,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2TrapInstance;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.instancezone.InstanceWorld;
 import com.l2jserver.gameserver.model.quest.Quest;
-import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -1020,11 +1019,7 @@ public final class Stage1 extends Quest
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		int npcId = npc.getId();
-		QuestState st = player.getQuestState(getName());
-		if (st == null)
-		{
-			st = newQuestState(player);
-		}
+		getQuestState(player, true);
 		if (npcId == ALENOS)
 		{
 			InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player);

L2J_DataPack/dist/game/data/scripts/gracia/instances/SeedOfInfinity/HallOfSuffering.java

@@ -511,10 +511,7 @@ public final class HallOfSuffering extends Quest
 			{
 				teleportPlayer(partyMember, coords, instanceId);
 				world.addAllowed(partyMember.getObjectId());
-				if (partyMember.getQuestState(getName()) == null)
-				{
-					newQuestState(partyMember);
-				}
+				getQuestState(partyMember, true);
 			}
 		}
 		return instanceId;
@@ -883,7 +880,7 @@ public final class HallOfSuffering extends Quest
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		int npcId = npc.getId();
-		QuestState st = player.getQuestState(getName());
+		QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			st = newQuestState(player);

L2J_DataPack/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java

@@ -362,11 +362,7 @@ public abstract class Chamber extends Quest
 		
 		for (L2PcInstance partyMember : party.getMembers())
 		{
-			QuestState st = partyMember.getQuestState(getName());
-			if (st == null)
-			{
-				st = newQuestState(partyMember);
-			}
+			final QuestState st = getQuestState(partyMember, true);
 			
 			if (st.hasQuestItems(DELUSION_MARK))
 			{
@@ -449,7 +445,7 @@ public abstract class Chamber extends Quest
 		}
 		final Instance inst = InstanceManager.getInstance().getInstance(player.getInstanceId());
 		Location ret = inst.getSpawnLoc();
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		
 		if (st != null)
 		{
@@ -491,7 +487,7 @@ public abstract class Chamber extends Quest
 		{
 			final CDWorld world = (CDWorld) tmpworld;
 			
-			QuestState st = player.getQuestState(getName());
+			QuestState st = getQuestState(player, false);
 			
 			if (st == null)
 			{
@@ -661,7 +657,7 @@ public abstract class Chamber extends Quest
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		int npcId = npc.getId();
-		QuestState st = player.getQuestState(getName());
+		QuestState st = getQuestState(player, false);
 		
 		if (st == null)
 		{

L2J_DataPack/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java

@@ -2476,11 +2476,7 @@ public final class CrystalCaverns extends Quest
 			{
 				if (partyMember.getInstanceId() == instanceId)
 				{
-					QuestState st = partyMember.getQuestState(getName());
-					if (st == null)
-					{
-						st = newQuestState(partyMember);
-					}
+					final QuestState st = getQuestState(partyMember, true);
 					if (!isBaylor && st.hasQuestItems(CONT_CRYSTAL))
 					{
 						st.takeItems(CONT_CRYSTAL, 1);
@@ -2499,7 +2495,7 @@ public final class CrystalCaverns extends Quest
 		}
 		else if (player.getInstanceId() == instanceId)
 		{
-			QuestState st = player.getQuestState(getName());
+			QuestState st = getQuestState(player, false);
 			if (st == null)
 			{
 				st = newQuestState(player);
@@ -2758,7 +2754,7 @@ public final class CrystalCaverns extends Quest
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		int npcId = npc.getId();
-		QuestState st = player.getQuestState(getName());
+		QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			st = newQuestState(player);

L2J_DataPack/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java

@@ -561,10 +561,7 @@ public final class DarkCloudMansion extends Quest
 		{
 			for (L2PcInstance partyMember : party.getMembers())
 			{
-				if (partyMember.getQuestState(getName()) == null)
-				{
-					newQuestState(partyMember);
-				}
+				getQuestState(partyMember, true);
 				world.addAllowed(partyMember.getObjectId());
 				teleportPlayer(partyMember, loc, instanceId);
 			}
@@ -1408,11 +1405,7 @@ public final class DarkCloudMansion extends Quest
 			if ((npc.getId() == SOTruth) && (world.getStatus() == 10))
 			{
 				npc.showChatWindow(player);
-				QuestState st = player.getQuestState(getName());
-				if (st == null)
-				{
-					st = newQuestState(player);
-				}
+				QuestState st = getQuestState(player, true);
 				
 				if (!st.hasQuestItems(CC))
 				{

L2J_DataPack/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java

@@ -59,7 +59,6 @@ import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.instancezone.InstanceWorld;
 import com.l2jserver.gameserver.model.quest.Quest;
-import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -1576,11 +1575,7 @@ public final class FinalEmperialTomb extends Quest
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		int npcId = npc.getId();
-		QuestState st = player.getQuestState(getName());
-		if (st == null)
-		{
-			st = newQuestState(player);
-		}
+		getQuestState(player, true);
 		if (npcId == GUIDE)
 		{
 			enterInstance(player, "FinalEmperialTomb.xml", ENTER_TELEPORT);

L2J_DataPack/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java

@@ -238,11 +238,6 @@ public final class NornilsGarden extends Quest
 	@Override
 	public final void teleportPlayer(L2PcInstance player, Location loc, int instanceId)
 	{
-		QuestState st = player.getQuestState(getName());
-		if (st == null)
-		{
-			st = newQuestState(player);
-		}
 		removeBuffs(player);
 		giveBuffs(player);
 		if (player.hasSummon())
@@ -524,10 +519,8 @@ public final class NornilsGarden extends Quest
 	@Override
 	public final String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		player.sendMessage("On Event");
-		
 		String htmltext = event;
-		QuestState st = player.getQuestState(getName());
+		QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return getNoQuestMsg(player);
@@ -609,11 +602,7 @@ public final class NornilsGarden extends Quest
 	@Override
 	public final String onFirstTalk(L2Npc npc, L2PcInstance player)
 	{
-		QuestState st = player.getQuestState(getName());
-		if (st == null)
-		{
-			st = newQuestState(player);
-		}
+		getQuestState(player, true);
 		return npc.getId() + ".html";
 	}
 	
@@ -636,7 +625,7 @@ public final class NornilsGarden extends Quest
 	@Override
 	public final String onKill(L2Npc npc, L2PcInstance player, boolean isSummon)
 	{
-		QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return null;

L2J_DataPack/dist/game/data/scripts/quests/118_ToLeadAndBeLed/__init__.py

@@ -28,7 +28,7 @@ class Quest (JQuest) :
 
  def onAdvEvent (self,event,npc, player) :
    htmltext = event
-   st = player.getQuestState(qn)
+   st = self.getQuestState(player, False)
    if not st : return
    if event == "30517-02.htm" :
      st.set("cond","1")
@@ -160,7 +160,7 @@ class Quest (JQuest) :
    return htmltext
 
  def onKill(self,npc,player,isPet):
-    st = player.getQuestState(qn)
+    st = self.getQuestState(player, False)
     if not st : return
     if st.getState() != State.STARTED : return
     sponsor = player.getSponsor()

L2J_DataPack/dist/game/data/scripts/quests/123_TheLeaderAndTheFollower/__init__.py

@@ -26,7 +26,7 @@ class Quest (JQuest) :
 
  def onAdvEvent (self,event,npc, player) :
    htmltext = event
-   st = player.getQuestState(qn)
+   st = self.getQuestState(player, False)
    if not st : return
    if event == "31961-02.htm" :
      st.set("cond","1")
@@ -164,7 +164,7 @@ class Quest (JQuest) :
    return htmltext
 
  def onKill(self,npc,player,isPet):
-    st = player.getQuestState(qn)
+    st = self.getQuestState(player, False)
     if not st : return
     if st.getState() != State.STARTED : return
     sponsor = player.getSponsor()

L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/__init__.py

@@ -31,7 +31,7 @@ class Quest (JQuest) :
 
  def onAdvEvent (self,event,npc, player) :
      htmltext = event
-     st = player.getQuestState(qn)
+     st = self.getQuestState(player, False)
      if not st : return
      cond = st.getInt("cond")
      if st.getState() != State.COMPLETED :
@@ -157,7 +157,7 @@ class Quest (JQuest) :
      return htmltext
 
  def onKill(self,npc,player,isPet):
-     st = player.getQuestState(qn)
+     st = self.getQuestState(player, False)
      if not st : return 
      if st.getState() != State.STARTED : return 
 

L2J_DataPack/dist/game/data/scripts/quests/178_IconicTrinity/__init__.py

@@ -22,7 +22,7 @@ class Quest (JQuest) :
  
  def onAdvEvent (self,event,npc, player) :
      htmltext = event
-     st = player.getQuestState(qn)
+     st = self.getQuestState(player, False)
      if not st : return
      player = st.getPlayer()
      passwrd = st.getInt("pass")

L2J_DataPack/dist/game/data/scripts/quests/184_Nikolas_Cooperation_Contract/__init__.py

@@ -31,7 +31,7 @@ class Quest (JQuest) :
         self.questItemIds = [NicolasMap,BrokenMetal,Metal]
 
     def onAdvEvent (self,event,npc, player) :
-        st = player.getQuestState(qn)
+        st = self.getQuestState(player, False)
         if not st: return
         htmltext = event
         if event == "30621-01.htm":

L2J_DataPack/dist/game/data/scripts/quests/185_Nikolas_Cooperation_Consideration/__init__.py

@@ -31,7 +31,7 @@ class Quest (JQuest) :
         self.questItemIds = [NicolasMap,BrokenMetal,Metal]
 
     def onAdvEvent (self,event,npc, player) :
-        st = player.getQuestState(qn)
+        st = self.getQuestState(player, False)
         if not st: return
         htmltext = event
         if event == "30621-01.htm":
@@ -151,7 +151,7 @@ class Quest (JQuest) :
         return htmltext
 
     def onFirstTalk (self,npc,player):
-       st = player.getQuestState(qn)
+       st = self.getQuestState(player, False)
        q2 = QuestManager.getInstance().getQuest("184_Nikolas_Cooperation_Contract")
        if st:
            player.setLastQuestNpcObject(npc.getObjectId())

L2J_DataPack/dist/game/data/scripts/quests/222_TestOfDuelist/__init__.py

@@ -45,7 +45,7 @@ class Quest (JQuest) :
 
  def onAdvEvent (self,event,npc, player) :
     htmltext = event
-    st = player.getQuestState(qn)
+    st = self.getQuestState(player, False)
     if not st : return
     if event == "30623-07.htm" :
         if st.getInt("step")==0 :
@@ -142,7 +142,7 @@ class Quest (JQuest) :
    return htmltext
 
  def onKill(self,npc,player,isPet):
-  st = player.getQuestState(qn)
+  st = self.getQuestState(player, False)
   if not st : return 
   if st.getState() != State.STARTED : return 
    

L2J_DataPack/dist/game/data/scripts/quests/227_TestOfReformer/__init__.py

@@ -39,7 +39,7 @@ class Quest (JQuest) :
 
  def onAdvEvent (self,event,npc, player) :
     htmltext = event
-    st = player.getQuestState(qn)
+    st = self.getQuestState(player, False)
     if not st : return
     if event == "1" :
         htmltext = "30118-04.htm"
@@ -183,7 +183,7 @@ class Quest (JQuest) :
    return htmltext
 
  def onKill(self,npc,player,isPet):
-   st = player.getQuestState(qn)
+   st = self.getQuestState(player, False)
    if not st : return 
    if st.getState() != State.STARTED : return 
    npcId = npc.getId()

L2J_DataPack/dist/game/data/scripts/quests/22_TragedyInVonHellmannForest/__init__.py

@@ -41,7 +41,7 @@ class Quest (JQuest) :
      self.well = 0
 
  def onAdvEvent (self,event,npc, player) :
-   st = player.getQuestState(qn)
+   st = self.getQuestState(player, False)
    if not st: return
    htmltext = event 
    if event == "31334-02.htm" :
@@ -269,7 +269,7 @@ class Quest (JQuest) :
    return htmltext
 
  def onAttack (self,npc,player,damage,isPet,skill):
-   st = player.getQuestState(qn)
+   st = self.getQuestState(player, False)
    if st :
        npcId = npc.getId()
        id = st.getInt("id")
@@ -285,7 +285,7 @@ class Quest (JQuest) :
 
  def onKill(self,npc,player,isPet):
    npcId = npc.getId()
-   st = player.getQuestState(qn)
+   st = self.getQuestState(player, False)
    if st :
        if npcId == SOUL_OF_WELL :
            self.well = 0

L2J_DataPack/dist/game/data/scripts/quests/230_TestOfSummoner/__init__.py

@@ -116,7 +116,7 @@ class Quest (JQuest) :
 
    def onAdvEvent (self,event,npc, player) :
       htmltext = event
-      st = player.getQuestState(qn)
+      st = self.getQuestState(player, False)
       if not st : return
       if event == "30634-08.htm" :                    # start part for Galatea
          for var in STATS:
@@ -301,7 +301,7 @@ class Quest (JQuest) :
    # on the first attack, the stat is in battle... anytime gives crystal and set stat
    def onAttack (self, npc, player,damage,isPet,skill):
       npcId = npc.getId()
-      st = player.getQuestState(qn)
+      st = self.getQuestState(player, False)
       if npcId in DROPLIST_SUMMON.keys() :
          var,start,progress,foul,defeat,victory = DROPLIST_SUMMON[npcId]
          # check if this npc has been attacked before
@@ -330,7 +330,7 @@ class Quest (JQuest) :
 
    def onKill(self,npc,player,isPet):
       npcId = npc.getId() 
-      st = player.getQuestState(qn)
+      st = self.getQuestState(player, False)
       # this part is just for laras parts.  It is only available to players who are doing the quest
       if npcId in DROPLIST_LARA.keys() :
          if not st : return

L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/__init__.py

@@ -318,7 +318,7 @@ class Quest (JQuest) :
     return htmltext    
         
   def onKill(self,npc,player,isPet):
-    st = player.getQuestState(qn)
+    st = self.getQuestState(player, False)
     if not st : return 
     npcId=npc.getId()
 

L2J_DataPack/dist/game/data/scripts/quests/234_FatesWhisper/__init__.py

@@ -70,7 +70,7 @@ class Quest (JQuest) :
 
   def onAdvEvent (self,event,npc, player) :
     htmltext = event
-    st = player.getQuestState(qn)
+    st = self.getQuestState(player, False)
     if not st : return
     #accept quest
     if event == "1" :
@@ -288,7 +288,7 @@ class Quest (JQuest) :
     return htmltext
 
   def onAttack (self, npc, player, damage, isPet, skill):
-    st = player.getQuestState(qn)
+    st = self.getQuestState(player, False)
     if not st : return 
     if st.getState() != State.STARTED : return 
     if isPet : return
@@ -325,7 +325,7 @@ class Quest (JQuest) :
         if stw.getQuestItemsCount(dropId) >= 30:
           stw.set("cond","9")
       else:
-        st = player.getQuestState(qn)
+        st = self.getQuestState(player, False)
         if not st : return
         if st.getState() != State.STARTED : return
         if npcId in DROPLIST.keys() :

L2J_DataPack/dist/game/data/scripts/quests/236_SeedsOfChaos/__init__.py

@@ -69,7 +69,7 @@ class Quest (JQuest) :
     self.questItemId = [BLACK_ECHO_CRYSTAL, SHINING_MEDALLION]
  
  def onAdvEvent (self,event,npc, player) :
-    st = player.getQuestState(qn)
+    st = self.getQuestState(player, False)
     if not st : return
     if event == "1" : #Go talk to the wizard!
         st.setState(State.STARTED)
@@ -230,7 +230,7 @@ class Quest (JQuest) :
     return htmltext
  
  def onKill(self,npc,player,isPet):
-    st = player.getQuestState(qn)
+    st = self.getQuestState(player, False)
     if not st : return 
     if st.getState() != State.STARTED : return 
     #The following algorithm should work for both quest mobs and drops for this quest.... hopefully.

L2J_DataPack/dist/game/data/scripts/quests/23_LidiasHeart/__init__.py

@@ -32,7 +32,7 @@ class Quest (JQuest) :
        self.questItemIds = [MapForestofDeadman,SilverKey,LidiaHairPin,LidiaDiary,SilverSpear] 
 
     def onAdvEvent (self,event,npc,player) :
-        st = player.getQuestState(qn)
+        st = self.getQuestState(player, False)
         htmltext = event
         if event == "31328-02.htm": # call 31328-03.htm
             st.giveItems(MapForestofDeadman,1)

L2J_DataPack/dist/game/data/scripts/quests/25_HidingBehindTheTruth/__init__.py

@@ -39,7 +39,7 @@ class Quest (JQuest) :
 
 
     def onAdvEvent (self,event,npc, player) :
-        st = player.getQuestState(qn)
+        st = self.getQuestState(player, False)
         if not st: return
         htmltext = event
         if event == "31349-02.htm" :
@@ -228,7 +228,7 @@ class Quest (JQuest) :
         return htmltext
 
     def onKill(self,npc,player,isPet):
-        st = player.getQuestState(qn)
+        st = self.getQuestState(player, False)
         if not st : return
         if st.getState() != State.STARTED : return
         if st.getInt("cond") == 7:

L2J_DataPack/dist/game/data/scripts/quests/330_AdeptOfTaste/__init__.py

@@ -296,7 +296,7 @@ class Quest (JQuest) :
    return htmltext
 
  def onKill(self,npc,player,isPet):
-   st = player.getQuestState(qn)
+   st = self.getQuestState(player, False)
    if not st : return 
    if st.getState() != State.STARTED : return 
    

L2J_DataPack/dist/game/data/scripts/quests/333_BlackLionHunt/__init__.py

@@ -553,7 +553,7 @@ class Quest (JQuest) :
           return m_no_box
           
   def onKill(self,npc,player,isPet):
-    st = player.getQuestState(qn)
+    st = self.getQuestState(player, False)
     if not st : return 
     if st.getState() != State.STARTED : return 
 

L2J_DataPack/dist/game/data/scripts/quests/334_TheWishingPotion/__init__.py

@@ -79,7 +79,7 @@ class Quest (JQuest) :
      self.questItemIds = range(3678,3683)+range(3684,3692)
 
  def onAdvEvent (self,event,npc,player):
-   st = player.getQuestState(qn)
+   st = self.getQuestState(player, False)
    if not st: return
    htmltext = event
    player=st.getPlayer()
@@ -277,7 +277,7 @@ class Quest (JQuest) :
    return htmltext
 
  def onKill(self,npc,player,isPet):
-   st = player.getQuestState(qn)
+   st = self.getQuestState(player, False)
    if not st : return
    id = st.getState()
    if id == State.CREATED: return

L2J_DataPack/dist/game/data/scripts/quests/335_TheSongOfTheHunter/__init__.py

@@ -295,7 +295,7 @@ class Quest (JQuest) :
         self.questItemIds = range(3692,3811) + [3471]
 
     def onAdvEvent (self,event,npc,player):
-        st = player.getQuestState(qn)
+        st = self.getQuestState(player, False)
         if not st: return
         htmltext = event
         if event == "30744-03.htm" :
@@ -505,7 +505,7 @@ class Quest (JQuest) :
         return htmltext
 
     def onKill(self,npc,player,isPet):
-        st = player.getQuestState(qn)
+        st = self.getQuestState(player, False)
         if not st : return
         npcId = npc.getId()
         cond = st.getInt("cond")

L2J_DataPack/dist/game/data/scripts/quests/336_CoinOfMagic/__init__.py

@@ -345,7 +345,7 @@ class Quest (JQuest) :
    st = 0
    # solo section of the quest
    if npcId in [HARITMATR, HARITSHA] :
-      st = player.getQuestState(qn)
+      st = self.getQuestState(player, False)
       if not st: return
       if st.getState() != State.STARTED or not st.get("part") or st.get("part") != "SOLO" : return
    if not npcId in [HARITMATR, HARITSHA] :

L2J_DataPack/dist/game/data/scripts/quests/337_AudienceWithTheLandDragon/__init__.py

@@ -57,7 +57,7 @@ class Quest (JQuest) :
 
  def onAdvEvent (self,event,npc,player):
      if player :
-         st = player.getQuestState(qn)
+         st = self.getQuestState(player, False)
          if not st : return
          htmltext = event
          if event == "30753-02.htm" :
@@ -247,7 +247,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onAttack (self, npc, player, damage, isPet, skill):
-   st = player.getQuestState(qn)
+   st = self.getQuestState(player, False)
    if st :
      npcId = npc.getId()
      maxHp = npc.getMaxHp()
@@ -302,7 +302,7 @@ class Quest (JQuest) :
 
  def onKill(self,npc,player,isPet):
     npcId = npc.getId()
-    st = player.getQuestState(qn)
+    st = self.getQuestState(player, False)
     if st :
         cond = st.getInt("cond")
         if cond == 1 :

L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/__init__.py

@@ -29,7 +29,7 @@ class Quest (JQuest) :
      self.questItemIds = [TOTEM]
  
  def onAdvEvent (self, event, npc, player) :
-     st = player.getQuestState(qn)
+     st = self.getQuestState(player, False)
      if not st: return
      htmltext = event
      if event == "30385-03.htm" :
@@ -130,7 +130,7 @@ class Quest (JQuest) :
      return htmltext
     
  def onKill(self,npc,player,isPet):
-     st = player.getQuestState(qn)
+     st = self.getQuestState(player, False)
      if not st : return 
      npcId = npc.getId()
      chanse = self.getRandom(100)

L2J_DataPack/dist/game/data/scripts/quests/343_UnderTheShadowOfTheIvoryTower/__init__.py

@@ -188,7 +188,7 @@ class Quest (JQuest) :
      return htmltext
 
  def onKill(self,npc,player,isPet):
-     st = player.getQuestState(qn)
+     st = self.getQuestState(player, False)
      if not st : return 
      if st.getState() != State.STARTED : return 
    

L2J_DataPack/dist/game/data/scripts/quests/348_ArrogantSearch/__init__.py

@@ -346,7 +346,7 @@ class Quest (JQuest) :
     return htmltext
 
  def onAttack (self, npc, player, damage, isPet, skill):
-     st = player.getQuestState(qn)
+     st = self.getQuestState(player, False)
      if not st : return
      if st.getState() != State.STARTED : return
 
@@ -374,7 +374,7 @@ class Quest (JQuest) :
      return
 
  def onKill(self,npc,player,isPet):
-     st = player.getQuestState(qn)
+     st = self.getQuestState(player, False)
      if not st : return
      if st.getState() != State.STARTED : return
 

L2J_DataPack/dist/game/data/scripts/quests/384_WarehouseKeepersPastime/__init__.py

@@ -142,7 +142,7 @@ class Quest (JQuest) :
             return item
 
  def onAdvEvent (self,event,npc,player):
-   st = player.getQuestState(qn)
+   st = self.getQuestState(player, False)
    if not st: return
    htmltext = event
    npcId = str(npc.getId())
@@ -238,7 +238,7 @@ class Quest (JQuest) :
    return htmltext
 
  def onKill(self,npc,player,isPet) :
-     st = player.getQuestState(qn)
+     st = self.getQuestState(player, False)
      if not st : return
      npcId = npc.getId()
      if npcId in Droplist.keys() :

L2J_DataPack/dist/game/data/scripts/quests/419_GetAPet/__init__.py

@@ -217,7 +217,7 @@ class Quest (JQuest):
     return
 
   def onKill(self,npc,player,isPet):
-      st = player.getQuestState(qn)
+      st = self.getQuestState(player, False)
       if not st : return 
       if st.getState() != State.STARTED : return 
    

L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/__init__.py

@@ -50,7 +50,7 @@ class Quest (JQuest) :
 
  def onAdvEvent (self,event,npc,player) :
     htmltext = event
-    st = player.getQuestState(qn)
+    st = self.getQuestState(player, False)
     if not st: return
     if event == "Start" :
         st.playSound("ItemSound.quest_accept")
@@ -243,7 +243,7 @@ class Quest (JQuest) :
 
 
  def onKill(self,npc,player,isPet) :
-   st = player.getQuestState(qn)
+   st = self.getQuestState(player, False)
    if not st : return
    if st.getState() != State.STARTED : return
    condition = st.getInt("cond")

L2J_DataPack/dist/game/data/scripts/quests/503_PursuitClanAmbition/__init__.py

@@ -498,7 +498,7 @@ class Quest (JQuest) :
     # only if the leader is online and within a certain distance!
     leader_st = 0
     if player.isClanLeader() :
-      leader_st = player.getQuestState(qn)
+      leader_st = self.getQuestState(player, False)
     else :
       clan = player.getClan()
       if clan:

L2J_DataPack/dist/game/data/scripts/quests/604_DaimontheWhiteEyedPart2/__init__.py

@@ -52,7 +52,7 @@ class Quest (JQuest) :
    elif event == "spawn_npc" :
       self.addSpawn(31541,186304,-43744,-3193,57000, False, 0, True)
       return
-   st = player.getQuestState(qn)
+   st = self.getQuestState(player, False)
    if not st: return
    cond = st.getInt("cond") 
    htmltext = event 
@@ -144,7 +144,7 @@ class Quest (JQuest) :
             st.set("cond","3") 
             st.playSound("ItemSound.quest_middle")
         else :
-            st = player.getQuestState(qn)
+            st = self.getQuestState(player, False)
             if not st : return
             if st.getState() == State.STARTED and (st.getInt("cond") == 1 or st.getInt("cond") == 2) :
                 if st.getQuestItemsCount(S_SUMMON) > 0 :

L2J_DataPack/dist/game/data/scripts/quests/60_GoodWorkReward/__init__.py

@@ -77,7 +77,7 @@ class Quest (JQuest) :
     if event == "npc_cleanup" :
       self.isNpcSpawned = 0
       return
-    st = player.getQuestState(qn)
+    st = self.getQuestState(player, False)
     if not st: return
     htmltext = event
     if event == "31435-03.htm" :
@@ -211,7 +211,7 @@ class Quest (JQuest) :
  def onKill(self,npc,player,isPet):
    self.cancelQuestTimer("npc_cleanup", None, None)
    self.isNpcSpawned = 0
-   st = player.getQuestState(qn)
+   st = self.getQuestState(player, False)
    if not st : return
    if st.getState() != State.STARTED : return
    npcId = npc.getId()

L2J_DataPack/dist/game/data/scripts/quests/620_FourGoblets/__init__.py

@@ -115,7 +115,7 @@ class Quest (JQuest) :
     return htmltext
 
   def onKill (self,npc,player,isPet) :
-    st = player.getQuestState(qn)
+    st = self.getQuestState(player, False)
     npcId = npc.getId()
     if st:
       if int(st.get("cond")) == 1 or int(st.get("cond")) == 2 :
@@ -127,7 +127,7 @@ class Quest (JQuest) :
 
   def onAdvEvent (self,event,npc,player) :
     htmltext = event
-    st = player.getQuestState(qn)
+    st = self.getQuestState(player, False)
     htmltext = event
     if event == "Enter" : 
       FourSepulchersManager.getInstance().tryEntry(npc,player)

L2J_DataPack/dist/game/data/scripts/quests/65_CertifiedSoulBreaker/__init__.py

@@ -98,7 +98,7 @@ class Quest (JQuest) :
         return htmltext
 
     def onFirstTalk (self,npc,player):
-        st = player.getQuestState(qn)
+        st = self.getQuestState(player, False)
         if st :
             if npc.getId() == Katenar and st.getInt("cond") == 12:
                 st.unset("angel")
@@ -245,7 +245,7 @@ class Quest (JQuest) :
         return htmltext
 
     def onKill(self,npc,player,isPet):
-        st = player.getQuestState(qn)
+        st = self.getQuestState(player, False)
         if not st : return
         if st.getState() != State.STARTED : return
         npcId = npc.getId()

L2J_DataPack/dist/game/data/scripts/quests/663_SeductiveWhispers/__init__.py

@@ -170,7 +170,7 @@ class Quest (JQuest) :
    return htmltext
  
  def onKill(self,npc,player,isPet):
-   st = player.getQuestState(qn)
+   st = self.getQuestState(player, False)
    if not st : return
    if st.getState() != State.STARTED : return
    npcId = npc.getId()

L2J_DataPack/dist/game/data/scripts/quests/999_T1Tutorial/__init__.py

@@ -79,7 +79,7 @@ class Quest (JQuest) :
  def onAdvEvent(self,event,npc,player):
     if Config.DISABLE_TUTORIAL :
         return
-    st = player.getQuestState(qn)
+    st = self.getQuestState(player, False)
     if not st: return
     htmltext = event
     qs = st.getPlayer().getQuestState(qnTutorial)
@@ -142,9 +142,7 @@ class Quest (JQuest) :
    if not qs : 
       npc.showChatWindow(player)
       return None
-   st = player.getQuestState(qn)
-   if not st :
-      st = self.newQuestState(player)
+   st = self.getQuestState(player, True)
    htmltext = ""
    Ex = qs.getInt("Ex")
    npcId = npc.getId()
@@ -231,7 +229,7 @@ class Quest (JQuest) :
  def onKill(self,npc,player,isPet):
    if Config.DISABLE_TUTORIAL :
      return
-   st = player.getQuestState(qn)
+   st = self.getQuestState(player, False)
    if not st : return
    qs = st.getPlayer().getQuestState(qnTutorial)
    if not qs : return

L2J_DataPack/dist/game/data/scripts/quests/AbstractSagaQuest.java

@@ -71,7 +71,7 @@ public abstract class AbstractSagaQuest extends Quest
 	
 	private QuestState findQuest(L2PcInstance player)
 	{
-		QuestState st = player.getQuestState(getName());
+		QuestState st = getQuestState(player, false);
 		if (st != null)
 		{
 			if (getId() == 68)
@@ -157,7 +157,7 @@ public abstract class AbstractSagaQuest extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		QuestState st = player.getQuestState(getName());
+		QuestState st = getQuestState(player, false);
 		String htmltext = null;
 		if (st != null)
 		{
@@ -444,7 +444,7 @@ public abstract class AbstractSagaQuest extends Quest
 		if (st2 != null)
 		{
 			int cond = st2.getCond();
-			QuestState st = player.getQuestState(getName());
+			QuestState st = getQuestState(player, false);
 			int npcId = npc.getId();
 			if ((npcId == Mob[2]) && (st == st2) && (cond == 17))
 			{
@@ -483,7 +483,7 @@ public abstract class AbstractSagaQuest extends Quest
 	public String onFirstTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = "";
-		QuestState st = player.getQuestState(getName());
+		QuestState st = getQuestState(player, false);
 		int npcId = npc.getId();
 		if (st != null)
 		{
@@ -555,7 +555,7 @@ public abstract class AbstractSagaQuest extends Quest
 	public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon)
 	{
 		int npcId = npc.getId();
-		QuestState st = player.getQuestState(getName());
+		QuestState st = getQuestState(player, false);
 		for (int Archon_Minion = 21646; Archon_Minion < 21652; Archon_Minion++)
 		{
 			if (npcId == Archon_Minion)

L2J_DataPack/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java

@@ -55,7 +55,7 @@ public class Q00001_LettersOfLove extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return null;

L2J_DataPack/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java

@@ -58,7 +58,7 @@ public class Q00002_WhatWomenWant extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return null;

L2J_DataPack/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java

@@ -61,7 +61,7 @@ public class Q00003_WillTheSealBeBroken extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return null;
@@ -90,7 +90,7 @@ public class Q00003_WillTheSealBeBroken extends Quest
 		{
 			return super.onKill(npc, player, isSummon);
 		}
-		final QuestState st = member.getQuestState(getName());
+		final QuestState st = getQuestState(member, false);
 		switch (npc.getId())
 		{
 			case OMEN_BEAST:

L2J_DataPack/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java

@@ -63,7 +63,7 @@ public class Q00004_LongLiveThePaagrioLord extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return null;

L2J_DataPack/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java

@@ -60,7 +60,7 @@ public class Q00005_MinersFavor extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return null;

L2J_DataPack/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java

@@ -53,7 +53,7 @@ public class Q00006_StepIntoTheFuture extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return null;

L2J_DataPack/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java

@@ -53,7 +53,7 @@ public class Q00007_ATripBegins extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return null;

L2J_DataPack/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java

@@ -53,7 +53,7 @@ public class Q00008_AnAdventureBegins extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return null;

L2J_DataPack/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java

@@ -51,7 +51,7 @@ public class Q00009_IntoTheCityOfHumans extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return null;

L2J_DataPack/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java

@@ -53,7 +53,7 @@ public class Q00010_IntoTheWorld extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return null;

L2J_DataPack/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java

@@ -50,7 +50,7 @@ public class Q00011_SecretMeetingWithKetraOrcs extends Quest
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = event;
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return htmltext;

L2J_DataPack/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java

@@ -50,7 +50,7 @@ public class Q00012_SecretMeetingWithVarkaSilenos extends Quest
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = event;
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return htmltext;

L2J_DataPack/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java

@@ -49,7 +49,7 @@ public class Q00013_ParcelDelivery extends Quest
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = event;
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return htmltext;

L2J_DataPack/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java

@@ -49,7 +49,7 @@ public class Q00014_WhereaboutsOfTheArchaeologist extends Quest
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = event;
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return htmltext;

L2J_DataPack/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java

@@ -47,7 +47,7 @@ public class Q00015_SweetWhispers extends Quest
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = event;
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return htmltext;

L2J_DataPack/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java

@@ -56,7 +56,7 @@ public class Q00016_TheComingDarkness extends Quest
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = event;
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return htmltext;

L2J_DataPack/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java

@@ -54,7 +54,7 @@ public class Q00017_LightAndDarkness extends Quest
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = event;
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return htmltext;

L2J_DataPack/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java

@@ -50,7 +50,7 @@ public class Q00018_MeetingWithTheGoldenRam extends Quest
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = event;
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return htmltext;

L2J_DataPack/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java

@@ -50,7 +50,7 @@ public class Q00019_GoToThePastureland extends Quest
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = event;
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		
 		if (st == null)
 		{

L2J_DataPack/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java

@@ -48,7 +48,7 @@ public class Q00020_BringUpWithLove extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return null;

L2J_DataPack/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java

@@ -75,7 +75,7 @@ public class Q00021_HiddenTruth extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		QuestState st = player.getQuestState(getName());
+		QuestState st = getQuestState(player, false);
 		String htmltext = null;
 		if (st != null)
 		{

L2J_DataPack/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java

@@ -61,7 +61,7 @@ public class Q00024_InhabitantsOfTheForestOfTheDead extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return null;
@@ -206,7 +206,7 @@ public class Q00024_InhabitantsOfTheForestOfTheDead extends Quest
 	@Override
 	public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		
 		if ((st != null) && st.isCond(9) && (getRandom(100) < 10))
 		{

L2J_DataPack/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java

@@ -57,7 +57,7 @@ public final class Q00026_TiredOfWaiting extends Quest
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = null;
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return htmltext;

L2J_DataPack/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java

@@ -53,7 +53,7 @@ public class Q00027_ChestCaughtWithABaitOfWind extends Quest
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = event;
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return htmltext;

L2J_DataPack/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java

@@ -53,7 +53,7 @@ public class Q00028_ChestCaughtWithABaitOfIcyAir extends Quest
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = event;
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return htmltext;

L2J_DataPack/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java

@@ -53,7 +53,7 @@ public class Q00029_ChestCaughtWithABaitOfEarth extends Quest
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = event;
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return htmltext;

L2J_DataPack/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java

@@ -53,7 +53,7 @@ public class Q00030_ChestCaughtWithABaitOfFire extends Quest
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = event;
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return htmltext;

L2J_DataPack/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java

@@ -59,7 +59,7 @@ public final class Q00031_SecretBuriedInTheSwamp extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		String htmltext = null;
 		if (st == null)
 		{

L2J_DataPack/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java

@@ -57,7 +57,7 @@ public class Q00033_MakeAPairOfDressShoes extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return null;

L2J_DataPack/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java

@@ -65,7 +65,7 @@ public class Q00034_InSearchOfCloth extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return null;
@@ -122,7 +122,7 @@ public class Q00034_InSearchOfCloth extends Quest
 		final L2PcInstance member = getRandomPartyMember(player, 4);
 		if ((member != null) && getRandomBoolean())
 		{
-			final QuestState st = member.getQuestState(getName());
+			final QuestState st = getQuestState(member, false);
 			st.giveItems(SPINNERET, 1);
 			if (st.getQuestItemsCount(SPINNERET) >= SPINNERET_COUNT)
 			{

L2J_DataPack/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java

@@ -61,7 +61,7 @@ public class Q00035_FindGlitteringJewelry extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return null;
@@ -111,7 +111,7 @@ public class Q00035_FindGlitteringJewelry extends Quest
 		final L2PcInstance member = getRandomPartyMember(player, 2);
 		if (member != null)
 		{
-			final QuestState st = member.getQuestState(getName());
+			final QuestState st = getQuestState(member, false);
 			if (getRandomBoolean())
 			{
 				st.giveItems(ROUGH_JEWEL, 1);

L2J_DataPack/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java

@@ -57,7 +57,7 @@ public class Q00036_MakeASewingKit extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return null;
@@ -103,7 +103,7 @@ public class Q00036_MakeASewingKit extends Quest
 		final L2PcInstance member = getRandomPartyMember(player, 1);
 		if (member != null)
 		{
-			final QuestState st = member.getQuestState(getName());
+			final QuestState st = getQuestState(member, false);
 			if (getRandomBoolean())
 			{
 				st.giveItems(ENCHANTED_IRON, 1);

L2J_DataPack/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java

@@ -58,7 +58,7 @@ public class Q00037_MakeFormalWear extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return null;

L2J_DataPack/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java

@@ -59,7 +59,7 @@ public final class Q00040_ASpecialOrder extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return null;

L2J_DataPack/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java

@@ -56,7 +56,7 @@ public class Q00042_HelpTheUncle extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return getNoQuestMsg(player);
@@ -113,7 +113,7 @@ public class Q00042_HelpTheUncle extends Quest
 	@Override
 	public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon)
 	{
-		QuestState st = player.getQuestState(getName());
+		QuestState st = getQuestState(player, false);
 		
 		if ((st != null) && st.isCond(2))
 		{

L2J_DataPack/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java

@@ -56,7 +56,7 @@ public class Q00043_HelpTheSister extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return getNoQuestMsg(player);
@@ -113,7 +113,7 @@ public class Q00043_HelpTheSister extends Quest
 	@Override
 	public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon)
 	{
-		QuestState st = player.getQuestState(getName());
+		QuestState st = getQuestState(player, false);
 		
 		if ((st != null) && st.isCond(2))
 		{

L2J_DataPack/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java

@@ -57,7 +57,7 @@ public class Q00044_HelpTheSon extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return getNoQuestMsg(player);
@@ -115,7 +115,7 @@ public class Q00044_HelpTheSon extends Quest
 	@Override
 	public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		if ((st != null) && st.isCond(2))
 		{
 			st.giveItems(GEMSTONE_FRAGMENT, 1);

L2J_DataPack/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java

@@ -74,7 +74,7 @@ public final class Q00045_ToTalkingIsland extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		String htmltext = null;
 		if (st == null)
 		{

L2J_DataPack/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java

@@ -74,7 +74,7 @@ public final class Q00046_OnceMoreInTheArmsOfTheMotherTree extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		String htmltext = null;
 		if (st == null)
 		{

L2J_DataPack/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java

@@ -74,7 +74,7 @@ public final class Q00047_IntoTheDarkElvenForest extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		String htmltext = null;
 		if (st == null)
 		{

L2J_DataPack/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java

@@ -74,7 +74,7 @@ public final class Q00048_ToTheImmortalPlateau extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		String htmltext = null;
 		if (st == null)
 		{

L2J_DataPack/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java

@@ -74,7 +74,7 @@ public final class Q00049_TheRoadHome extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		final QuestState st = player.getQuestState(getName());
+		final QuestState st = getQuestState(player, false);
 		String htmltext = null;
 		if (st == null)
 		{

L2J_DataPack/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java

@@ -52,7 +52,7 @@ public class Q00050_LanoscosSpecialBait extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		QuestState st = player.getQuestState(getName());
+		QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return getNoQuestMsg(player);
@@ -86,7 +86,7 @@ public class Q00050_LanoscosSpecialBait extends Quest
 			return null;
 		}
 		
-		final QuestState st = partyMember.getQuestState(getName());
+		final QuestState st = getQuestState(partyMember, false);
 		
 		if (st.getQuestItemsCount(ESSENCE_OF_WIND) < 100)
 		{

L2J_DataPack/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java

@@ -52,7 +52,7 @@ public class Q00051_OFullesSpecialBait extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		QuestState st = player.getQuestState(getName());
+		QuestState st = getQuestState(player, false);
 		if (st == null)
 		{
 			return getNoQuestMsg(player);
@@ -85,7 +85,7 @@ public class Q00051_OFullesSpecialBait extends Quest
 			return null;
 		}
 		
-		final QuestState st = partyMember.getQuestState(getName());
+		final QuestState st = getQuestState(partyMember, false);
 		if (st.getQuestItemsCount(LOST_BAIT) < 100)
 		{
 			float chance = 33 * Config.RATE_QUEST_DROP;