Removed simulated onTalk method.

L2J_Mobius_Classic/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java

@@ -87,6 +87,10 @@ public class QuestLink implements IBypassHandler
 		final StringBuilder sbCanStart = new StringBuilder(128);
 		final StringBuilder sbCantStart = new StringBuilder(128);
 		final StringBuilder sbCompleted = new StringBuilder(128);
+		int availableQuestCounter = 0;
+		int inProgressQuestCounter = 0;
+		Quest lastSavedAvailableQuest = null;
+		Quest lastSavedProgressQuest = null;
 		
 		//@formatter:off
 		final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
@@ -109,11 +113,6 @@ public class QuestLink implements IBypassHandler
 		
 		for (Quest quest : quests)
 		{
-			if (quest.getId() == 255) // do not list tutorial quest
-			{
-				continue;
-			}
-			
 			final QuestState qs = player.getQuestState(quest.getScriptName());
 			if ((qs == null) || qs.isCreated() || (qs.isCompleted() && qs.isNowAvailable()))
 			{
@@ -128,6 +127,8 @@ public class QuestLink implements IBypassHandler
 					sbCanStart.append("<button icon=\"quest\" align=\"left\" action=\"bypass -h npc_" + npc.getObjectId() + "_Quest " + quest.getName() + "\">");
 					sbCanStart.append(quest.isCustomQuest() ? quest.getPath() : "<fstring>" + quest.getNpcStringId() + "01</fstring>");
 					sbCanStart.append("</button></font>");
+					availableQuestCounter++;
+					lastSavedAvailableQuest = quest;
 				}
 				else
 				{
@@ -137,16 +138,14 @@ public class QuestLink implements IBypassHandler
 					sbCantStart.append("</button></font>");
 				}
 			}
-			else if (Quest.getNoQuestMsg(player).equals(quest.onTalk(npc, player, true)))
-			{
-				continue;
-			}
 			else if (qs.isStarted())
 			{
 				sbStarted.append("<font color=\"ffdd66\">");
 				sbStarted.append("<button icon=\"quest\" align=\"left\" action=\"bypass -h npc_" + npc.getObjectId() + "_Quest " + quest.getName() + "\">");
 				sbStarted.append(quest.isCustomQuest() ? quest.getPath() + " (In Progress)" : "<fstring>" + quest.getNpcStringId() + "02</fstring>");
 				sbStarted.append("</button></font>");
+				inProgressQuestCounter++;
+				lastSavedProgressQuest = quest;
 			}
 			else if (qs.isCompleted())
 			{
@@ -157,6 +156,17 @@ public class QuestLink implements IBypassHandler
 			}
 		}
 		
+		if ((availableQuestCounter == 0) && (inProgressQuestCounter == 1) && (lastSavedProgressQuest != null))
+		{
+			showQuestWindow(player, npc, lastSavedProgressQuest.getName());
+			return;
+		}
+		if ((availableQuestCounter == 1) && (inProgressQuestCounter == 0) && (lastSavedAvailableQuest != null))
+		{
+			showQuestWindow(player, npc, lastSavedAvailableQuest.getName());
+			return;
+		}
+		
 		String content;
 		if ((sbStarted.length() > 0) || (sbCanStart.length() > 0) || (sbCantStart.length() > 0) || (sbCompleted.length() > 0))
 		{
@@ -223,7 +233,7 @@ public class QuestLink implements IBypassHandler
 				}
 			}
 			
-			q.notifyTalk(npc, player, false);
+			q.notifyTalk(npc, player);
 		}
 		else
 		{
@@ -253,8 +263,7 @@ public class QuestLink implements IBypassHandler
 			.map(AbstractEventListener::getOwner)
 			.filter(Quest.class::isInstance)
 			.map(Quest.class::cast)
-			.filter(quest -> (quest.getId() > 0) && (quest.getId() < 20000))
+			.filter(quest -> (quest.getId() > 0) && (quest.getId() < 20000) && (quest.getId() != 255))
-			//.filter(quest -> !Quest.getNoQuestMsg(player).equals(quest.onTalk(npc, player, true)))
 			.distinct()
 			.collect(Collectors.toSet());
 		//@formatter:on

L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/quest/Quest.java

@@ -613,9 +613,8 @@ public class Quest extends AbstractScript implements IIdentifiable
 	/**
 	 * @param npc
 	 * @param player
-	 * @param isSimulated
 	 */
-	public final void notifyTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public final void notifyTalk(L2Npc npc, L2PcInstance player)
 	{
 		String res = null;
 		try
@@ -636,7 +635,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			}
 			else
 			{
-				res = onTalk(npc, player, isSimulated);
+				res = onTalk(npc, player);
 			}
 		}
 		catch (Exception e)
@@ -1125,19 +1124,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 		return null;
 	}
 	
-	/**
-	 * This function is called whenever a player clicks to the "Quest" link of an NPC that is registered for the quest.<br>
-	 * <font color="red"><b>This method overrides {@link #onTalk(L2Npc, L2PcInstance)}</b></font>
-	 * @param npc this parameter contains a reference to the exact instance of the NPC that the player is talking with.
-	 * @param talker this parameter contains a reference to the exact instance of the player who is talking to the NPC.
-	 * @param isSimulated this parameter contains indication if the call to this onTalk is just to verify if the player has some buisness with this npc or not, no actions should be taken if its true!
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onTalk(L2Npc npc, L2PcInstance talker, boolean isSimulated)
-	{
-		return onTalk(npc, talker);
-	}
-	
 	/**
 	 * This function is called whenever a player talks to an NPC that is registered for the quest.<br>
 	 * That is, it is triggered from the very first click on the NPC, not via another dialog.<br>

L2J_Mobius_Helios/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java

@@ -87,6 +87,10 @@ public class QuestLink implements IBypassHandler
 		final StringBuilder sbCanStart = new StringBuilder(128);
 		final StringBuilder sbCantStart = new StringBuilder(128);
 		final StringBuilder sbCompleted = new StringBuilder(128);
+		int availableQuestCounter = 0;
+		int inProgressQuestCounter = 0;
+		Quest lastSavedAvailableQuest = null;
+		Quest lastSavedProgressQuest = null;
 		
 		//@formatter:off
 		final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
@@ -123,6 +127,8 @@ public class QuestLink implements IBypassHandler
 					sbCanStart.append("<button icon=\"quest\" align=\"left\" action=\"bypass -h npc_" + npc.getObjectId() + "_Quest " + quest.getName() + "\">");
 					sbCanStart.append(quest.isCustomQuest() ? quest.getPath() : "<fstring>" + quest.getNpcStringId() + "01</fstring>");
 					sbCanStart.append("</button></font>");
+					availableQuestCounter++;
+					lastSavedAvailableQuest = quest;
 				}
 				else
 				{
@@ -132,16 +138,14 @@ public class QuestLink implements IBypassHandler
 					sbCantStart.append("</button></font>");
 				}
 			}
-			else if (Quest.getNoQuestMsg(player).equals(quest.onTalk(npc, player, true)))
-			{
-				continue;
-			}
 			else if (qs.isStarted())
 			{
 				sbStarted.append("<font color=\"ffdd66\">");
 				sbStarted.append("<button icon=\"quest\" align=\"left\" action=\"bypass -h npc_" + npc.getObjectId() + "_Quest " + quest.getName() + "\">");
 				sbStarted.append(quest.isCustomQuest() ? quest.getPath() + " (In Progress)" : "<fstring>" + quest.getNpcStringId() + "02</fstring>");
 				sbStarted.append("</button></font>");
+				inProgressQuestCounter++;
+				lastSavedProgressQuest = quest;
 			}
 			else if (qs.isCompleted())
 			{
@@ -152,6 +156,17 @@ public class QuestLink implements IBypassHandler
 			}
 		}
 		
+		if ((availableQuestCounter == 0) && (inProgressQuestCounter == 1) && (lastSavedProgressQuest != null))
+		{
+			showQuestWindow(player, npc, lastSavedProgressQuest.getName());
+			return;
+		}
+		if ((availableQuestCounter == 1) && (inProgressQuestCounter == 0) && (lastSavedAvailableQuest != null))
+		{
+			showQuestWindow(player, npc, lastSavedAvailableQuest.getName());
+			return;
+		}
+		
 		String content;
 		if ((sbStarted.length() > 0) || (sbCanStart.length() > 0) || (sbCantStart.length() > 0) || (sbCompleted.length() > 0))
 		{
@@ -218,7 +233,7 @@ public class QuestLink implements IBypassHandler
 				}
 			}
 			
-			q.notifyTalk(npc, player, false);
+			q.notifyTalk(npc, player);
 		}
 		else
 		{
@@ -249,7 +264,6 @@ public class QuestLink implements IBypassHandler
 			.filter(Quest.class::isInstance)
 			.map(Quest.class::cast)
 			.filter(quest -> (quest.getId() > 0) && (quest.getId() < 20000))
-			//.filter(quest -> !Quest.getNoQuestMsg(player).equals(quest.onTalk(npc, player, true)))
 			.distinct()
 			.collect(Collectors.toSet());
 		//@formatter:on

L2J_Mobius_Helios/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java

@@ -289,14 +289,14 @@ public final class EvilIncubator extends AbstractInstance
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player);
 		
 		if ((st == null) || !st.isStarted())
 		{
-			return super.onTalk(npc, player, isSimulated);
+			return super.onTalk(npc, player);
 		}
 		
 		if (st.getState() == State.STARTED)

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

@@ -165,7 +165,7 @@ public final class Q00016_TheComingDarkness extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, true);
@@ -193,22 +193,16 @@ public final class Q00016_TheComingDarkness extends Quest
 								htmltext = "31517-04.html";
 							}
 							else
-							{
-								if (!isSimulated)
 							{
 								qs.exitQuest(true, true);
-								}
 								htmltext = "31517-06.html";
 							}
 							break;
 						}
 						else if (qs.isCond(6))
-						{
-							if (!isSimulated)
 						{
 							addExpAndSp(player, 1_795_524, 79);
 							qs.exitQuest(false, true);
-							}
 							htmltext = "31517-05.html";
 						}
 					}

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

@@ -146,7 +146,7 @@ public final class Q00017_LightAndDarkness extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, true);
@@ -178,22 +178,16 @@ public final class Q00017_LightAndDarkness extends Quest
 								htmltext = "31517-04.html";
 							}
 							else
-							{
-								if (!isSimulated)
 							{
 								qs.exitQuest(true, true);
-								}
 								htmltext = "31517-06.html";
 							}
 							break;
 						}
 						else if (qs.isCond(5))
-						{
-							if (!isSimulated)
 						{
 							addExpAndSp(player, 1_469_840, 352);
 							qs.exitQuest(false, true);
-							}
 							htmltext = "31517-05.html";
 						}
 					}

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

@@ -107,7 +107,7 @@ public final class Q00040_ASpecialOrder extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);
@@ -171,13 +171,10 @@ public final class Q00040_ASpecialOrder extends Quest
 						if (npc.getId() == HELVETIA)
 						{
 							if (hasQuestItems(player, ELCYUM_CRYSTAL))
-							{
-								if (!isSimulated)
 							{
 								takeItems(player, ELCYUM_CRYSTAL, 1);
 								giveItems(player, WONDEROUS_CUBIC, 1);
 								st.exitQuest(false, true);
-								}
 								htmltext = "30081-08.html";
 							}
 							else

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java

@@ -228,7 +228,7 @@ public final class Q00453_NotStrongEnoughAlone extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);
@@ -265,8 +265,6 @@ public final class Q00453_NotStrongEnoughAlone extends Quest
 						break;
 					}
 					case 5:
-					{
-						if (!isSimulated)
 					{
 						final int random = getRandom(1000);
 						if (random < 34)
@@ -342,7 +340,6 @@ public final class Q00453_NotStrongEnoughAlone extends Quest
 							giveItems(player, 9551, 1); // Holy Stone
 						}
 						st.exitQuest(QuestType.DAILY, true);
-						}
 						htmltext = "32734-14.html";
 						break;
 					}

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java

@@ -101,7 +101,7 @@ public final class Q00470_DivinityProtector extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);
@@ -129,8 +129,6 @@ public final class Q00470_DivinityProtector extends Quest
 						htmltext = "32327-06.html";
 					}
 					else if (npc.getId() == AGRIPEL)
-					{
-						if (!isSimulated)
 					{
 						st.exitQuest(QuestType.DAILY, true);
 						giveAdena(player, 194_000, true);
@@ -138,7 +136,6 @@ public final class Q00470_DivinityProtector extends Quest
 						{
 							addExpAndSp(player, 1_879_400, 451);
 						}
-						}
 						htmltext = "31348-02.html";
 					}
 				}
@@ -147,11 +144,8 @@ public final class Q00470_DivinityProtector extends Quest
 			case State.COMPLETED:
 			{
 				if ((npc.getId() == ADVENTURER) && st.isNowAvailable())
-				{
-					if (!isSimulated)
 				{
 					st.setState(State.CREATED);
-					}
 					htmltext = "32327-01.htm";
 				}
 				break;

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java

@@ -84,7 +84,7 @@ public final class Q00474_WaitingForTheSummer extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
@@ -110,8 +110,6 @@ public final class Q00474_WaitingForTheSummer extends Quest
 			}
 		}
 		else if (qs.isStarted() && qs.isCond(2))
-		{
-			if (!isSimulated)
 		{
 			giveAdena(player, 194000, true);
 			if (player.getLevel() >= MIN_LEVEL)
@@ -119,7 +117,6 @@ public final class Q00474_WaitingForTheSummer extends Quest
 				addExpAndSp(player, 1879400, 451);
 			}
 			qs.exitQuest(QuestType.DAILY, true);
-			}
 			htmltext = "31981-01.html";
 		}
 		else if (qs.isCompleted() && !qs.isNowAvailable())

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java

@@ -108,7 +108,7 @@ public final class Q00476_PlainMission extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);
@@ -136,8 +136,6 @@ public final class Q00476_PlainMission extends Quest
 						htmltext = "32327-06.html";
 					}
 					else if (npc.getId() == ANDREI)
-					{
-						if (!isSimulated)
 					{
 						st.exitQuest(QuestType.DAILY, true);
 						giveAdena(player, 142_200, true);
@@ -145,7 +143,6 @@ public final class Q00476_PlainMission extends Quest
 						{
 							addExpAndSp(player, 4_685_175, 1_124);
 						}
-						}
 						htmltext = "31292-01.html";
 					}
 				}
@@ -154,11 +151,8 @@ public final class Q00476_PlainMission extends Quest
 			case State.COMPLETED:
 			{
 				if ((npc.getId() == ADVENTURER) && st.isNowAvailable())
-				{
-					if (!isSimulated)
 				{
 					st.setState(State.CREATED);
-					}
 					htmltext = "32327-01.htm";
 				}
 				else if ((npc.getId() == ANDREI) && st.isCompleted() && !st.isNowAvailable())

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java

@@ -91,7 +91,7 @@ public final class Q00485_HotSpringWater extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);
@@ -119,8 +119,6 @@ public final class Q00485_HotSpringWater extends Quest
 						htmltext = "32327-06.html";
 					}
 					else if (npc.getId() == WALDERAL)
-					{
-						if (!isSimulated)
 					{
 						st.exitQuest(QuestType.DAILY, true);
 						giveAdena(player, 371_745, true);
@@ -128,7 +126,6 @@ public final class Q00485_HotSpringWater extends Quest
 						{
 							addExpAndSp(player, 9_483_000, 2_275);
 						}
-						}
 						htmltext = "30844-02.html";
 					}
 				}
@@ -137,11 +134,8 @@ public final class Q00485_HotSpringWater extends Quest
 			case State.COMPLETED:
 			{
 				if ((npc.getId() == ADVENTURER) && st.isNowAvailable())
-				{
-					if (!isSimulated)
 				{
 					st.setState(State.CREATED);
-					}
 					htmltext = "32327-01.html";
 				}
 				else if ((npc.getId() == WALDERAL) && st.isCompleted() && !st.isNowAvailable())

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q00488_WondersOfCaring/Q00488_WondersOfCaring.java

@@ -90,7 +90,7 @@ public final class Q00488_WondersOfCaring extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);
@@ -118,8 +118,6 @@ public final class Q00488_WondersOfCaring extends Quest
 						htmltext = "32327-05.html";
 					}
 					else if (npc.getId() == DOLPHREN)
-					{
-						if (!isSimulated)
 					{
 						st.exitQuest(QuestType.DAILY, true);
 						giveAdena(player, 490_545, true);
@@ -127,7 +125,6 @@ public final class Q00488_WondersOfCaring extends Quest
 						{
 							addExpAndSp(player, 22_901_550, 5_496);
 						}
-						}
 						htmltext = "32880-02.html";
 					}
 				}
@@ -136,11 +133,8 @@ public final class Q00488_WondersOfCaring extends Quest
 			case State.COMPLETED:
 			{
 				if ((npc.getId() == ADVENTURER) && st.isNowAvailable())
-				{
-					if (!isSimulated)
 				{
 					st.setState(State.CREATED);
-					}
 					htmltext = "32327-01.htm";
 				}
 				else if ((npc.getId() == DOLPHREN) && st.isCompleted() && !st.isNowAvailable())

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q00489_InThisQuietPlace/Q00489_InThisQuietPlace.java

@@ -87,7 +87,7 @@ public final class Q00489_InThisQuietPlace extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);
@@ -115,8 +115,6 @@ public final class Q00489_InThisQuietPlace extends Quest
 						htmltext = "32327-06.html";
 					}
 					else if (npc.getId() == BESTIAN)
-					{
-						if (!isSimulated)
 					{
 						st.exitQuest(QuestType.DAILY, true);
 						giveAdena(player, 426_045, true);
@@ -124,7 +122,6 @@ public final class Q00489_InThisQuietPlace extends Quest
 						{
 							addExpAndSp(player, 19_890_000, 4_773);
 						}
-						}
 						htmltext = "32180-02.html";
 					}
 				}
@@ -133,11 +130,8 @@ public final class Q00489_InThisQuietPlace extends Quest
 			case State.COMPLETED:
 			{
 				if ((npc.getId() == ADVENTURER) && st.isNowAvailable())
-				{
-					if (!isSimulated)
 				{
 					st.setState(State.CREATED);
-					}
 					htmltext = "32327-01.htm";
 				}
 				else if ((npc.getId() == BESTIAN) && st.isCompleted() && !st.isNowAvailable())

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java

@@ -101,7 +101,7 @@ public final class Q00511_AwlUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
@@ -120,12 +120,9 @@ public final class Q00511_AwlUnderFoot extends Quest
 				htmltext = "Warden-07.html";
 			}
 			else
-			{
-				if (!isSimulated)
 			{
 				takeItems(player, MARK, itemCount);
 				giveItems(player, KNIGHT_EPALUETTE, itemCount * 2);
-				}
 				htmltext = "Warden-08.html";
 			}
 		}

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java

@@ -96,7 +96,7 @@ public final class Q00512_BladeUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
@@ -115,12 +115,9 @@ public final class Q00512_BladeUnderFoot extends Quest
 				htmltext = "Warden-07.html";
 			}
 			else
-			{
-				if (!isSimulated)
 			{
 				takeItems(player, MARK, itemCount);
 				giveItems(player, KNIGHT_EPALUETTE, itemCount * 2);
-				}
 				htmltext = "Warden-08.html";
 			}
 		}

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java

@@ -99,7 +99,7 @@ public final class Q00726_LightWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java

@@ -87,7 +87,7 @@ public final class Q00727_HopeWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java

@@ -92,7 +92,7 @@ public final class Q00760_BlockTheExit extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState st = getQuestState(player, true);
 		String htmltext = null;

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java

@@ -140,7 +140,7 @@ public final class Q00761_AssistingTheGoldenRamArmy extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState st = getQuestState(player, true);
 		String htmltext = null;
@@ -164,11 +164,8 @@ public final class Q00761_AssistingTheGoldenRamArmy extends Quest
 					htmltext = getAlreadyCompletedMsg(player, QuestType.DAILY);
 				}
 				else
-				{
-					if (!isSimulated)
 				{
 					st.setState(State.CREATED);
-					}
 					htmltext = "31553-01.htm";
 				}
 				break;

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java

@@ -169,7 +169,7 @@ public final class Q00762_AnOminousRequest extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState st = getQuestState(player, true);
 		String htmltext = null;
@@ -193,11 +193,8 @@ public final class Q00762_AnOminousRequest extends Quest
 					htmltext = getAlreadyCompletedMsg(player, QuestType.DAILY);
 				}
 				else
-				{
-					if (!isSimulated)
 				{
 					st.setState(State.CREATED);
-					}
 					htmltext = "31522-01.htm";
 				}
 				break;

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java

@@ -146,7 +146,7 @@ public final class Q00763_ADauntingTask extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState st = getQuestState(player, true);
 		String htmltext = null;
@@ -170,11 +170,8 @@ public final class Q00763_ADauntingTask extends Quest
 					htmltext = getAlreadyCompletedMsg(player, QuestType.DAILY);
 				}
 				else
-				{
-					if (!isSimulated)
 				{
 					st.setState(State.CREATED);
-					}
 					htmltext = "33851-01.htm";
 				}
 				break;

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java

@@ -97,7 +97,7 @@ public final class Q10336_DividedSakumKanilov extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);
@@ -121,12 +121,9 @@ public final class Q10336_DividedSakumKanilov extends Quest
 					case 2:
 					{
 						if (npc.getId() == ZENATH)
-						{
-							if (!isSimulated)
 						{
 							st.setCond(3);
 							giveItems(player, SAKUM_SKETCH, 1);
-							}
 							htmltext = "33509-05.html";
 						}
 						else

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java

@@ -106,7 +106,7 @@ public final class Q10339_FightingTheForgotten extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState st = getQuestState(player, true);
 		String htmltext = null;
@@ -141,13 +141,10 @@ public final class Q10339_FightingTheForgotten extends Quest
 							htmltext = "33344-02.html";
 							break;
 						case 3:
-						{
-							if (!isSimulated)
 						{
 							st.exitQuest(false, true);
 							giveAdena(player, 528_210, true);
 							addExpAndSp(player, 238_423_500, 57_221);
-							}
 							htmltext = "33344-03.html";
 							break;
 						}

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java

@@ -83,7 +83,7 @@ public final class Q10341_DayOfDestinyHumansFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, true);
@@ -106,6 +106,6 @@ public final class Q10341_DayOfDestinyHumansFate extends ThirdClassTransferQuest
 				}
 			}
 		}
-		return (!htmltext.equals(getNoQuestMsg(player)) ? htmltext : super.onTalk(npc, player, isSimulated));
+		return (!htmltext.equals(getNoQuestMsg(player)) ? htmltext : super.onTalk(npc, player));
 	}
 }

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java

@@ -83,7 +83,7 @@ public final class Q10342_DayOfDestinyElvenFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, true);
@@ -106,6 +106,6 @@ public final class Q10342_DayOfDestinyElvenFate extends ThirdClassTransferQuest
 				}
 			}
 		}
-		return (!htmltext.equals(getNoQuestMsg(player)) ? htmltext : super.onTalk(npc, player, isSimulated));
+		return (!htmltext.equals(getNoQuestMsg(player)) ? htmltext : super.onTalk(npc, player));
 	}
 }

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java

@@ -83,7 +83,7 @@ public final class Q10343_DayOfDestinyDarkElfsFate extends ThirdClassTransferQue
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, true);
@@ -106,6 +106,6 @@ public final class Q10343_DayOfDestinyDarkElfsFate extends ThirdClassTransferQue
 				}
 			}
 		}
-		return (!htmltext.equals(getNoQuestMsg(player)) ? htmltext : super.onTalk(npc, player, isSimulated));
+		return (!htmltext.equals(getNoQuestMsg(player)) ? htmltext : super.onTalk(npc, player));
 	}
 }

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java

@@ -83,7 +83,7 @@ public final class Q10344_DayOfDestinyOrcsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, true);
@@ -106,6 +106,6 @@ public final class Q10344_DayOfDestinyOrcsFate extends ThirdClassTransferQuest
 				}
 			}
 		}
-		return (!htmltext.equals(getNoQuestMsg(player)) ? htmltext : super.onTalk(npc, player, isSimulated));
+		return (!htmltext.equals(getNoQuestMsg(player)) ? htmltext : super.onTalk(npc, player));
 	}
 }

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java

@@ -83,7 +83,7 @@ public final class Q10345_DayOfDestinyDwarfsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, true);
@@ -106,6 +106,6 @@ public final class Q10345_DayOfDestinyDwarfsFate extends ThirdClassTransferQuest
 				}
 			}
 		}
-		return (!htmltext.equals(getNoQuestMsg(player)) ? htmltext : super.onTalk(npc, player, isSimulated));
+		return (!htmltext.equals(getNoQuestMsg(player)) ? htmltext : super.onTalk(npc, player));
 	}
 }

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java

@@ -83,7 +83,7 @@ public final class Q10346_DayOfDestinyKamaelsFate extends ThirdClassTransferQues
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, true);
@@ -106,6 +106,6 @@ public final class Q10346_DayOfDestinyKamaelsFate extends ThirdClassTransferQues
 				}
 			}
 		}
-		return (!htmltext.equals(getNoQuestMsg(player)) ? htmltext : super.onTalk(npc, player, isSimulated));
+		return (!htmltext.equals(getNoQuestMsg(player)) ? htmltext : super.onTalk(npc, player));
 	}
 }

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java

@@ -98,7 +98,7 @@ public final class Q10358_DividedSakumPoslof extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);
@@ -122,12 +122,9 @@ public final class Q10358_DividedSakumPoslof extends Quest
 					case 2:
 					{
 						if (npc.getId() == LEF)
-						{
-							if (!isSimulated)
 						{
 							st.setCond(3);
 							giveItems(player, SAKUM_SKETCH, 1);
-							}
 							htmltext = "33510-05.html";
 						}
 						else if (npc.getId() == ADVENTURER_GUIDE)

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java

@@ -134,7 +134,7 @@ public final class Q10359_TracesOfEvil extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);
@@ -177,54 +177,32 @@ public final class Q10359_TracesOfEvil extends Quest
 								switch (player.getRace())
 								{
 									case HUMAN:
-										if (!isSimulated)
-										{
 										st.setCond(player.isMageClass() ? 4 : 5);
-										}
 										htmltext = player.isMageClass() ? "33179-06.htm" : "33179-11.htm";
 										break;
 									case DARK_ELF:
-										if (!isSimulated)
-										{
 										st.setCond(6);
-										}
 										htmltext = "33179-05.htm";
 										break;
 									case ORC:
-										if (!isSimulated)
-										{
 										st.setCond(7);
-										}
 										htmltext = "33179-07.htm";
 										break;
 									case DWARF:
-										if (!isSimulated)
-										{
 										st.setCond(8);
-										}
 										htmltext = "33179-08.htm";
 										break;
 									case KAMAEL:
-										if (!isSimulated)
-										{
 										st.setCond(9);
-										}
 										htmltext = "33179-09.htm";
 										break;
 									case ELF:
-										if (!isSimulated)
-										{
 										st.setCond(player.isMageClass() ? 11 : 10);
-										}
 										htmltext = player.isMageClass() ? "33179-12.htm" : "33179-10.htm";
 										break;
 								}
-								
-								if (!isSimulated)
-								{
 								takeItems(player, FRAGMENT, 20);
 								playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE);
-								}
 								break;
 							}
 						}

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java

@@ -147,7 +147,7 @@ public final class Q10362_CertificationOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = null;

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java

@@ -265,7 +265,7 @@ public final class Q10369_NoblesseSoulTesting extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, true);
@@ -306,14 +306,11 @@ public final class Q10369_NoblesseSoulTesting extends Quest
 									htmltext = "31281-10.html";
 									break;
 								case 14:
-									if (!isSimulated)
-									{
 									final Quest instance = QuestManager.getInstance().getQuest(EvasHiddenSpace.class.getSimpleName());
 									if (instance != null)
 									{
 										instance.onAdvEvent("enterInstance", npc, player);
 									}
-									}
 									htmltext = null;
 									break;
 								case 17:
@@ -339,8 +336,6 @@ public final class Q10369_NoblesseSoulTesting extends Quest
 									htmltext = "33686-06.html";
 									break;
 								case 18:
-									if (!isSimulated)
-									{
 									player.doCast(NOBLESSE_PRESENTATION.getSkill());
 									showOnScreenMsg(player, NpcStringId.CONGRATULATIONS_YOU_ARE_NOW_A_NOBLESSE, ExShowScreenMessage.TOP_CENTER, 5000);
 									player.setNoble(true);
@@ -351,7 +346,6 @@ public final class Q10369_NoblesseSoulTesting extends Quest
 									giveItems(player, STEEL_COIN, 87);
 									addExpAndSp(player, 12_625_440, 0);
 									qs.exitQuest(false, true);
-									}
 									htmltext = "33686-07.html";
 									break;
 							}
@@ -380,13 +374,10 @@ public final class Q10369_NoblesseSoulTesting extends Quest
 									htmltext = "33696-10.html";
 									break;
 								case 13:
-									if (!isSimulated)
-									{
 									qs.setCond(14, true);
 									takeItems(player, HARD_FOSSIL_CONTAINING_WATER_ENERGY, -1);
 									giveItems(player, SACK_CONTAINING_INGREDIENTS, 1);
 									giveItems(player, SOE_SECRET_ROOM, 1);
-									}
 									htmltext = "33696-11.html";
 									break;
 							}

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java

@@ -426,7 +426,7 @@ public final class Q10385_RedThreadOfFate extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, true);

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java

@@ -112,7 +112,7 @@ public final class Q10386_MysteriousJourney extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);
@@ -150,8 +150,6 @@ public final class Q10386_MysteriousJourney extends Quest
 								htmltext = "33780-05.html";
 								break;
 							case 4:
-							{
-								if (!isSimulated)
 							{
 								giveAdena(player, 58_707, true);
 								giveItems(player, EWR, 1);
@@ -160,7 +158,6 @@ public final class Q10386_MysteriousJourney extends Quest
 									addExpAndSp(player, 27_244_350, 6_538);
 								}
 								st.exitQuest(false, true);
-								}
 								htmltext = "33780-06.html";
 								break;
 							}

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java

@@ -140,7 +140,7 @@ public final class Q10387_SoullessOne extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java

@@ -93,7 +93,7 @@ public final class Q10409_ASuspiciousVagabondInTheSwamp extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState st = getQuestState(player, true);
 		String htmltext = null;
@@ -115,11 +115,8 @@ public final class Q10409_ASuspiciousVagabondInTheSwamp extends Quest
 					htmltext = st.isCond(1) ? "33847-05.html" : "33847-06.html";
 				}
 				else if ((npc.getId() == VAGABOND) && st.isCond(1))
-				{
-					if (!isSimulated)
 				{
 					st.setCond(2, true);
-					}
 					htmltext = "33848-01.html";
 				}
 				break;

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java

@@ -93,7 +93,7 @@ public final class Q10412_ASuspiciousVagabondInTheForest extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState st = getQuestState(player, true);
 		String htmltext = null;
@@ -115,11 +115,8 @@ public final class Q10412_ASuspiciousVagabondInTheForest extends Quest
 					htmltext = st.isCond(1) ? "33849-05.html" : "33849-06.html";
 				}
 				else if ((npc.getId() == VAGABOND) && st.isCond(1))
-				{
-					if (!isSimulated)
 				{
 					st.setCond(2, true);
-					}
 					htmltext = "33850-01.html";
 				}
 				break;

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java

@@ -122,7 +122,7 @@ public final class Q10542_SearchingForNewPower extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, true);
@@ -168,8 +168,6 @@ public final class Q10542_SearchingForNewPower extends Quest
 					if (qs.isCond(2))
 					{
 						htmltext = "33004-01.html";
-						if (!isSimulated)
-						{
 						qs.setCond(3, true);
 						player.sendPacket(new TutorialShowHtml(npc.getObjectId(), "..\\L2text\\QT_004_skill_01.htm", TutorialShowHtml.LARGE_WINDOW));
 						htmltext = "33004-01.html";
@@ -220,7 +218,6 @@ public final class Q10542_SearchingForNewPower extends Quest
 							showOnScreenMsg(player, npcStringId, ExShowScreenMessage.TOP_CENTER, 4500);
 						}
 					}
-					}
 					else if (qs.isCond(5))
 					{
 						htmltext = "33004-03.html";

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java

@@ -114,7 +114,7 @@ public final class Q10734_DoOrDie extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
@@ -135,41 +135,29 @@ public final class Q10734_DoOrDie extends Quest
 							switch (qs.getCond())
 							{
 								case 1:
-								{
-									if (!isSimulated)
 								{
 									showOnScreenMsg(player, NpcStringId.ATTACK_THE_TRAINING_DUMMY, ExShowScreenMessage.TOP_CENTER, 10000);
-									}
 									htmltext = "33943-04.html";
 									break;
 								}
 								case 3:
-								{
-									if (!isSimulated)
 								{
 									showOnScreenMsg(player, NpcStringId.TALK_TO_THE_APPRENTICE_ADVENTURER_S_GUIDE, ExShowScreenMessage.TOP_CENTER, 10000);
 									qs.setCond(5, true);
-									}
 									htmltext = "33943-05.html";
 									break;
 								}
 								case 5:
-								{
-									if (!isSimulated)
 								{
 									showOnScreenMsg(player, NpcStringId.TALK_TO_THE_APPRENTICE_ADVENTURER_S_GUIDE, ExShowScreenMessage.TOP_CENTER, 10000);
-									}
 									htmltext = "33943-06.html";
 									break;
 								}
 								case 8:
-								{
-									if (!isSimulated)
 								{
 									giveAdena(player, 7000, true);
 									addExpAndSp(player, 805, 2);
 									qs.exitQuest(false, true);
-									}
 									htmltext = "33943-07.html";
 									break;
 								}
@@ -197,41 +185,29 @@ public final class Q10734_DoOrDie extends Quest
 							switch (qs.getCond())
 							{
 								case 1:
-								{
-									if (!isSimulated)
 								{
 									showOnScreenMsg(player, NpcStringId.ATTACK_THE_TRAINING_DUMMY, ExShowScreenMessage.TOP_CENTER, 10000);
-									}
 									htmltext = "33942-04.html";
 									break;
 								}
 								case 2:
-								{
-									if (!isSimulated)
 								{
 									showOnScreenMsg(player, NpcStringId.TALK_TO_THE_APPRENTICE_ADVENTURER_S_GUIDE, ExShowScreenMessage.TOP_CENTER, 10000);
 									qs.setCond(4, true);
-									}
 									htmltext = "33942-05.html";
 									break;
 								}
 								case 4:
-								{
-									if (!isSimulated)
 								{
 									showOnScreenMsg(player, NpcStringId.TALK_TO_THE_APPRENTICE_ADVENTURER_S_GUIDE, ExShowScreenMessage.TOP_CENTER, 10000);
-									}
 									htmltext = "33942-06.html";
 									break;
 								}
 								case 7:
-								{
-									if (!isSimulated)
 								{
 									giveAdena(player, 7000, true);
 									addExpAndSp(player, 805, 2);
 									qs.exitQuest(false, true);
-									}
 									htmltext = "33942-07.html";
 									break;
 								}
@@ -258,11 +234,8 @@ public final class Q10734_DoOrDie extends Quest
 							break;
 						}
 						case 6:
-						{
-							if (!isSimulated)
 						{
 							showOnScreenMsg(player, NpcStringId.ATTACK_THE_TRAINING_DUMMY, ExShowScreenMessage.TOP_CENTER, 10000);
-							}
 							htmltext = castBuffs(npc, player, "33950-07.html", "33950-08.html");
 							break;
 						}

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java

@@ -76,7 +76,7 @@ public final class Q10735_ASpecialPower extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
@@ -107,14 +107,11 @@ public final class Q10735_ASpecialPower extends Quest
 						break;
 					}
 					case 7:
-					{
-						if (!isSimulated)
 					{
 						giveAdena(player, 900, true);
 						rewardItems(player, SPIRITSHOTS_REWARD);
 						addExpAndSp(player, 3154, 0);
 						qs.exitQuest(false, true);
-						}
 						htmltext = "33942-05.html";
 						break;
 					}

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java

@@ -75,7 +75,7 @@ public final class Q10736_ASpecialPower extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
@@ -104,14 +104,11 @@ public final class Q10736_ASpecialPower extends Quest
 						break;
 					}
 					case 7:
-					{
-						if (!isSimulated)
 					{
 						giveAdena(player, 900, true);
 						rewardItems(player, SOULSHOTS_REWARD);
 						addExpAndSp(player, 3154, 0);
 						qs.exitQuest(false, true);
-						}
 						htmltext = "33943-05.html";
 						break;
 					}

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java

@@ -120,7 +120,7 @@ public final class Q10739_SupplyAndDemand extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
@@ -190,8 +190,6 @@ public final class Q10739_SupplyAndDemand extends Quest
 			}
 			case SIVANTHE:
 				if (qs.isStarted() && qs.isCond(4))
-				{
-					if (!isSimulated)
 				{
 					giveItems(player, LEATHER_SHIRT);
 					giveItems(player, LEATHER_PANTS);
@@ -201,7 +199,6 @@ public final class Q10739_SupplyAndDemand extends Quest
 					addExpAndSp(player, 8136, 0);
 					showOnScreenMsg(player, NpcStringId.CHECK_YOUR_EQUIPMENT_IN_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 10000);
 					qs.exitQuest(false, true);
-					}
 					htmltext = "33951-01.html";
 				}
 				else if (qs.isCompleted())

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java

@@ -105,7 +105,7 @@ public final class Q10740_NeverForget extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
@@ -134,8 +134,6 @@ public final class Q10740_NeverForget extends Quest
 								break;
 							}
 							case 3:
-							{
-								if (!isSimulated)
 							{
 								showOnScreenMsg(player, NpcStringId.CHECK_YOUR_EQUIPMENT_IN_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 10000);
 								giveAdena(player, 1600, true);
@@ -143,7 +141,6 @@ public final class Q10740_NeverForget extends Quest
 								giveItems(player, HEALING_POTION);
 								addExpAndSp(player, 16851, 0);
 								qs.exitQuest(false, true);
-								}
 								htmltext = "33951-06.html";
 								break;
 							}

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java

@@ -173,7 +173,7 @@ public final class Q10742_AFurryFriend extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
@@ -192,13 +192,10 @@ public final class Q10742_AFurryFriend extends Quest
 						htmltext = "33952-06.html";
 					}
 					else if (qs.isCond(2))
-					{
-						if (!isSimulated)
 					{
 						giveAdena(player, 2500, true);
 						addExpAndSp(player, 52516, 5);
 						qs.exitQuest(false, true);
-						}
 						htmltext = "33952-04.html";
 					}
 					break;

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java

@@ -88,7 +88,7 @@ public final class Q10744_StrongerThanSteel extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
@@ -125,13 +125,10 @@ public final class Q10744_StrongerThanSteel extends Quest
 						htmltext = "33954-04.html";
 					}
 					else if (qs.isCond(3))
-					{
-						if (!isSimulated)
 					{
 						giveAdena(player, 34000, true);
 						addExpAndSp(player, 112001, 5);
 						qs.exitQuest(false, true);
-						}
 						htmltext = "33954-05.html";
 					}
 				}

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java

@@ -88,7 +88,7 @@ public final class Q10746_SeeTheWorld extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
@@ -121,11 +121,8 @@ public final class Q10746_SeeTheWorld extends Quest
 				if (qs.isStarted())
 				{
 					if (qs.isCond(1))
-					{
-						if (!isSimulated)
 					{
 						qs.setCond(2, true);
-						}
 						htmltext = "33948-01.html";
 					}
 					else if (qs.isCond(2))
@@ -138,8 +135,6 @@ public final class Q10746_SeeTheWorld extends Quest
 			case LEVIAN:
 			{
 				if (qs.isStarted() && qs.isCond(2))
-				{
-					if (!isSimulated)
 				{
 					giveAdena(player, 43000, true);
 					addExpAndSp(player, 53422, 5);
@@ -153,7 +148,6 @@ public final class Q10746_SeeTheWorld extends Quest
 					}
 					showOnScreenMsg(player, NpcStringId.CHECK_YOUR_EQUIPMENT_IN_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 10000);
 					qs.exitQuest(false, true);
-					}
 					htmltext = "30037-01.html";
 				}
 				else if (qs.isCompleted())

L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java

@@ -260,7 +260,7 @@ public final class Q10814_BefittingOfTheStatus extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
@@ -276,7 +276,7 @@ public final class Q10814_BefittingOfTheStatus extends Quest
 			{
 				if ((qs.getCond() >= 1) && (qs.getCond() < 6))
 				{
-					htmltext = !isSimulated ? generateItemListHtml(player, npc) : null;
+					htmltext = generateItemListHtml(player, npc);
 				}
 				else if (qs.isCond(6))
 				{

L2J_Mobius_Helios/dist/game/data/scripts/quests/ThirdClassTransferQuest.java

@@ -255,7 +255,7 @@ public abstract class ThirdClassTransferQuest extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);

L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/quest/Quest.java

@@ -613,9 +613,8 @@ public class Quest extends AbstractScript implements IIdentifiable
 	/**
 	 * @param npc
 	 * @param player
-	 * @param isSimulated
 	 */
-	public final void notifyTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public final void notifyTalk(L2Npc npc, L2PcInstance player)
 	{
 		String res = null;
 		try
@@ -636,7 +635,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			}
 			else
 			{
-				res = onTalk(npc, player, isSimulated);
+				res = onTalk(npc, player);
 			}
 		}
 		catch (Exception e)
@@ -1125,19 +1124,6 @@ public class Quest extends AbstractScript implements IIdentifiable
 		return null;
 	}
 	
-	/**
-	 * This function is called whenever a player clicks to the "Quest" link of an NPC that is registered for the quest.<br>
-	 * <font color="red"><b>This method overrides {@link #onTalk(L2Npc, L2PcInstance)}</b></font>
-	 * @param npc this parameter contains a reference to the exact instance of the NPC that the player is talking with.
-	 * @param talker this parameter contains a reference to the exact instance of the player who is talking to the NPC.
-	 * @param isSimulated this parameter contains indication if the call to this onTalk is just to verify if the player has some buisness with this npc or not, no actions should be taken if its true!
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onTalk(L2Npc npc, L2PcInstance talker, boolean isSimulated)
-	{
-		return onTalk(npc, talker);
-	}
-	
 	/**
 	 * This function is called whenever a player talks to an NPC that is registered for the quest.<br>
 	 * That is, it is triggered from the very first click on the NPC, not via another dialog.<br>

L2J_Mobius_Underground/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java

@@ -87,6 +87,10 @@ public class QuestLink implements IBypassHandler
 		final StringBuilder sbCanStart = new StringBuilder(128);
 		final StringBuilder sbCantStart = new StringBuilder(128);
 		final StringBuilder sbCompleted = new StringBuilder(128);
+		int availableQuestCounter = 0;
+		int inProgressQuestCounter = 0;
+		Quest lastSavedAvailableQuest = null;
+		Quest lastSavedProgressQuest = null;
 		
 		//@formatter:off
 		final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
@@ -123,6 +127,8 @@ public class QuestLink implements IBypassHandler
 					sbCanStart.append("<button icon=\"quest\" align=\"left\" action=\"bypass -h npc_" + npc.getObjectId() + "_Quest " + quest.getName() + "\">");
 					sbCanStart.append(quest.isCustomQuest() ? quest.getPath() : "<fstring>" + quest.getNpcStringId() + "01</fstring>");
 					sbCanStart.append("</button></font>");
+					availableQuestCounter++;
+					lastSavedAvailableQuest = quest;
 				}
 				else
 				{
@@ -132,16 +138,14 @@ public class QuestLink implements IBypassHandler
 					sbCantStart.append("</button></font>");
 				}
 			}
-			else if (Quest.getNoQuestMsg(player).equals(quest.onTalk(npc, player, true)))
-			{
-				continue;
-			}
 			else if (qs.isStarted())
 			{
 				sbStarted.append("<font color=\"ffdd66\">");
 				sbStarted.append("<button icon=\"quest\" align=\"left\" action=\"bypass -h npc_" + npc.getObjectId() + "_Quest " + quest.getName() + "\">");
 				sbStarted.append(quest.isCustomQuest() ? quest.getPath() + " (In Progress)" : "<fstring>" + quest.getNpcStringId() + "02</fstring>");
 				sbStarted.append("</button></font>");
+				inProgressQuestCounter++;
+				lastSavedProgressQuest = quest;
 			}
 			else if (qs.isCompleted())
 			{
@@ -152,6 +156,17 @@ public class QuestLink implements IBypassHandler
 			}
 		}
 		
+		if ((availableQuestCounter == 0) && (inProgressQuestCounter == 1) && (lastSavedProgressQuest != null))
+		{
+			showQuestWindow(player, npc, lastSavedProgressQuest.getName());
+			return;
+		}
+		if ((availableQuestCounter == 1) && (inProgressQuestCounter == 0) && (lastSavedAvailableQuest != null))
+		{
+			showQuestWindow(player, npc, lastSavedAvailableQuest.getName());
+			return;
+		}
+		
 		String content;
 		if ((sbStarted.length() > 0) || (sbCanStart.length() > 0) || (sbCantStart.length() > 0) || (sbCompleted.length() > 0))
 		{
@@ -218,7 +233,7 @@ public class QuestLink implements IBypassHandler
 				}
 			}
 			
-			q.notifyTalk(npc, player, false);
+			q.notifyTalk(npc, player);
 		}
 		else
 		{
@@ -249,7 +264,6 @@ public class QuestLink implements IBypassHandler
 			.filter(Quest.class::isInstance)
 			.map(Quest.class::cast)
 			.filter(quest -> (quest.getId() > 0) && (quest.getId() < 20000))
-			//.filter(quest -> !Quest.getNoQuestMsg(player).equals(quest.onTalk(npc, player, true)))
 			.distinct()
 			.collect(Collectors.toSet());
 		//@formatter:on

L2J_Mobius_Underground/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java

@@ -289,14 +289,14 @@ public final class EvilIncubator extends AbstractInstance
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player);
 		
 		if ((st == null) || !st.isStarted())
 		{
-			return super.onTalk(npc, player, isSimulated);
+			return super.onTalk(npc, player);
 		}
 		
 		if (st.getState() == State.STARTED)

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

@@ -165,7 +165,7 @@ public final class Q00016_TheComingDarkness extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, true);
@@ -193,22 +193,16 @@ public final class Q00016_TheComingDarkness extends Quest
 								htmltext = "31517-04.html";
 							}
 							else
-							{
-								if (!isSimulated)
 							{
 								qs.exitQuest(true, true);
-								}
 								htmltext = "31517-06.html";
 							}
 							break;
 						}
 						else if (qs.isCond(6))
-						{
-							if (!isSimulated)
 						{
 							addExpAndSp(player, 1_795_524, 79);
 							qs.exitQuest(false, true);
-							}
 							htmltext = "31517-05.html";
 						}
 					}

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

@@ -146,7 +146,7 @@ public final class Q00017_LightAndDarkness extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, true);
@@ -178,22 +178,16 @@ public final class Q00017_LightAndDarkness extends Quest
 								htmltext = "31517-04.html";
 							}
 							else
-							{
-								if (!isSimulated)
 							{
 								qs.exitQuest(true, true);
-								}
 								htmltext = "31517-06.html";
 							}
 							break;
 						}
 						else if (qs.isCond(5))
-						{
-							if (!isSimulated)
 						{
 							addExpAndSp(player, 1_469_840, 352);
 							qs.exitQuest(false, true);
-							}
 							htmltext = "31517-05.html";
 						}
 					}

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

@@ -107,7 +107,7 @@ public final class Q00040_ASpecialOrder extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);
@@ -171,13 +171,10 @@ public final class Q00040_ASpecialOrder extends Quest
 						if (npc.getId() == HELVETIA)
 						{
 							if (hasQuestItems(player, ELCYUM_CRYSTAL))
-							{
-								if (!isSimulated)
 							{
 								takeItems(player, ELCYUM_CRYSTAL, 1);
 								giveItems(player, WONDEROUS_CUBIC, 1);
 								st.exitQuest(false, true);
-								}
 								htmltext = "30081-08.html";
 							}
 							else

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java

@@ -228,7 +228,7 @@ public final class Q00453_NotStrongEnoughAlone extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);
@@ -265,8 +265,6 @@ public final class Q00453_NotStrongEnoughAlone extends Quest
 						break;
 					}
 					case 5:
-					{
-						if (!isSimulated)
 					{
 						final int random = getRandom(1000);
 						if (random < 34)
@@ -342,7 +340,6 @@ public final class Q00453_NotStrongEnoughAlone extends Quest
 							giveItems(player, 9551, 1); // Holy Stone
 						}
 						st.exitQuest(QuestType.DAILY, true);
-						}
 						htmltext = "32734-14.html";
 						break;
 					}

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java

@@ -101,7 +101,7 @@ public final class Q00470_DivinityProtector extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);
@@ -129,8 +129,6 @@ public final class Q00470_DivinityProtector extends Quest
 						htmltext = "32327-06.html";
 					}
 					else if (npc.getId() == AGRIPEL)
-					{
-						if (!isSimulated)
 					{
 						st.exitQuest(QuestType.DAILY, true);
 						giveAdena(player, 194_000, true);
@@ -138,7 +136,6 @@ public final class Q00470_DivinityProtector extends Quest
 						{
 							addExpAndSp(player, 1_879_400, 451);
 						}
-						}
 						htmltext = "31348-02.html";
 					}
 				}
@@ -147,11 +144,8 @@ public final class Q00470_DivinityProtector extends Quest
 			case State.COMPLETED:
 			{
 				if ((npc.getId() == ADVENTURER) && st.isNowAvailable())
-				{
-					if (!isSimulated)
 				{
 					st.setState(State.CREATED);
-					}
 					htmltext = "32327-01.htm";
 				}
 				break;

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java

@@ -84,7 +84,7 @@ public final class Q00474_WaitingForTheSummer extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
@@ -110,8 +110,6 @@ public final class Q00474_WaitingForTheSummer extends Quest
 			}
 		}
 		else if (qs.isStarted() && qs.isCond(2))
-		{
-			if (!isSimulated)
 		{
 			giveAdena(player, 194000, true);
 			if (player.getLevel() >= MIN_LEVEL)
@@ -119,7 +117,6 @@ public final class Q00474_WaitingForTheSummer extends Quest
 				addExpAndSp(player, 1879400, 451);
 			}
 			qs.exitQuest(QuestType.DAILY, true);
-			}
 			htmltext = "31981-01.html";
 		}
 		else if (qs.isCompleted() && !qs.isNowAvailable())

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java

@@ -108,7 +108,7 @@ public final class Q00476_PlainMission extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);
@@ -136,8 +136,6 @@ public final class Q00476_PlainMission extends Quest
 						htmltext = "32327-06.html";
 					}
 					else if (npc.getId() == ANDREI)
-					{
-						if (!isSimulated)
 					{
 						st.exitQuest(QuestType.DAILY, true);
 						giveAdena(player, 142_200, true);
@@ -145,7 +143,6 @@ public final class Q00476_PlainMission extends Quest
 						{
 							addExpAndSp(player, 4_685_175, 1_124);
 						}
-						}
 						htmltext = "31292-01.html";
 					}
 				}
@@ -154,11 +151,8 @@ public final class Q00476_PlainMission extends Quest
 			case State.COMPLETED:
 			{
 				if ((npc.getId() == ADVENTURER) && st.isNowAvailable())
-				{
-					if (!isSimulated)
 				{
 					st.setState(State.CREATED);
-					}
 					htmltext = "32327-01.htm";
 				}
 				else if ((npc.getId() == ANDREI) && st.isCompleted() && !st.isNowAvailable())

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00481_ShadowHelper/Q00481_ShadowHelper.java

@@ -104,7 +104,7 @@ public final class Q00481_ShadowHelper extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
@@ -130,12 +130,9 @@ public final class Q00481_ShadowHelper extends Quest
 					htmltext = "33302-06.html";
 				}
 				else
-				{
-					if (!isSimulated)
 				{
 					addExpAndSp(player, 240000, 57);
 					qs.exitQuest(QuestType.DAILY, true);
-					}
 					htmltext = "33302-08.html";
 				}
 				break;

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java

@@ -91,7 +91,7 @@ public final class Q00485_HotSpringWater extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);
@@ -119,8 +119,6 @@ public final class Q00485_HotSpringWater extends Quest
 						htmltext = "32327-06.html";
 					}
 					else if (npc.getId() == WALDERAL)
-					{
-						if (!isSimulated)
 					{
 						st.exitQuest(QuestType.DAILY, true);
 						giveAdena(player, 371_745, true);
@@ -128,7 +126,6 @@ public final class Q00485_HotSpringWater extends Quest
 						{
 							addExpAndSp(player, 9_483_000, 2_275);
 						}
-						}
 						htmltext = "30844-02.html";
 					}
 				}
@@ -137,11 +134,8 @@ public final class Q00485_HotSpringWater extends Quest
 			case State.COMPLETED:
 			{
 				if ((npc.getId() == ADVENTURER) && st.isNowAvailable())
-				{
-					if (!isSimulated)
 				{
 					st.setState(State.CREATED);
-					}
 					htmltext = "32327-01.html";
 				}
 				else if ((npc.getId() == WALDERAL) && st.isCompleted() && !st.isNowAvailable())

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00488_WondersOfCaring/Q00488_WondersOfCaring.java

@@ -90,7 +90,7 @@ public final class Q00488_WondersOfCaring extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);
@@ -118,8 +118,6 @@ public final class Q00488_WondersOfCaring extends Quest
 						htmltext = "32327-05.html";
 					}
 					else if (npc.getId() == DOLPHREN)
-					{
-						if (!isSimulated)
 					{
 						st.exitQuest(QuestType.DAILY, true);
 						giveAdena(player, 490_545, true);
@@ -127,7 +125,6 @@ public final class Q00488_WondersOfCaring extends Quest
 						{
 							addExpAndSp(player, 22_901_550, 5_496);
 						}
-						}
 						htmltext = "32880-02.html";
 					}
 				}
@@ -136,11 +133,8 @@ public final class Q00488_WondersOfCaring extends Quest
 			case State.COMPLETED:
 			{
 				if ((npc.getId() == ADVENTURER) && st.isNowAvailable())
-				{
-					if (!isSimulated)
 				{
 					st.setState(State.CREATED);
-					}
 					htmltext = "32327-01.htm";
 				}
 				else if ((npc.getId() == DOLPHREN) && st.isCompleted() && !st.isNowAvailable())

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00489_InThisQuietPlace/Q00489_InThisQuietPlace.java

@@ -87,7 +87,7 @@ public final class Q00489_InThisQuietPlace extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);
@@ -115,8 +115,6 @@ public final class Q00489_InThisQuietPlace extends Quest
 						htmltext = "32327-06.html";
 					}
 					else if (npc.getId() == BESTIAN)
-					{
-						if (!isSimulated)
 					{
 						st.exitQuest(QuestType.DAILY, true);
 						giveAdena(player, 426_045, true);
@@ -124,7 +122,6 @@ public final class Q00489_InThisQuietPlace extends Quest
 						{
 							addExpAndSp(player, 19_890_000, 4_773);
 						}
-						}
 						htmltext = "32180-02.html";
 					}
 				}
@@ -133,11 +130,8 @@ public final class Q00489_InThisQuietPlace extends Quest
 			case State.COMPLETED:
 			{
 				if ((npc.getId() == ADVENTURER) && st.isNowAvailable())
-				{
-					if (!isSimulated)
 				{
 					st.setState(State.CREATED);
-					}
 					htmltext = "32327-01.htm";
 				}
 				else if ((npc.getId() == BESTIAN) && st.isCompleted() && !st.isNowAvailable())

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java

@@ -101,7 +101,7 @@ public final class Q00511_AwlUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
@@ -120,12 +120,9 @@ public final class Q00511_AwlUnderFoot extends Quest
 				htmltext = "Warden-07.html";
 			}
 			else
-			{
-				if (!isSimulated)
 			{
 				takeItems(player, MARK, itemCount);
 				giveItems(player, KNIGHT_EPALUETTE, itemCount * 2);
-				}
 				htmltext = "Warden-08.html";
 			}
 		}

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java

@@ -96,7 +96,7 @@ public final class Q00512_BladeUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
@@ -115,12 +115,9 @@ public final class Q00512_BladeUnderFoot extends Quest
 				htmltext = "Warden-07.html";
 			}
 			else
-			{
-				if (!isSimulated)
 			{
 				takeItems(player, MARK, itemCount);
 				giveItems(player, KNIGHT_EPALUETTE, itemCount * 2);
-				}
 				htmltext = "Warden-08.html";
 			}
 		}

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java

@@ -99,7 +99,7 @@ public final class Q00726_LightWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java

@@ -87,7 +87,7 @@ public final class Q00727_HopeWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java

@@ -92,7 +92,7 @@ public final class Q00760_BlockTheExit extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState st = getQuestState(player, true);
 		String htmltext = null;

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java

@@ -140,7 +140,7 @@ public final class Q00761_AssistingTheGoldenRamArmy extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState st = getQuestState(player, true);
 		String htmltext = null;
@@ -164,11 +164,8 @@ public final class Q00761_AssistingTheGoldenRamArmy extends Quest
 					htmltext = getAlreadyCompletedMsg(player, QuestType.DAILY);
 				}
 				else
-				{
-					if (!isSimulated)
 				{
 					st.setState(State.CREATED);
-					}
 					htmltext = "31553-01.htm";
 				}
 				break;

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java

@@ -169,7 +169,7 @@ public final class Q00762_AnOminousRequest extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState st = getQuestState(player, true);
 		String htmltext = null;
@@ -193,11 +193,8 @@ public final class Q00762_AnOminousRequest extends Quest
 					htmltext = getAlreadyCompletedMsg(player, QuestType.DAILY);
 				}
 				else
-				{
-					if (!isSimulated)
 				{
 					st.setState(State.CREATED);
-					}
 					htmltext = "31522-01.htm";
 				}
 				break;

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java

@@ -146,7 +146,7 @@ public final class Q00763_ADauntingTask extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState st = getQuestState(player, true);
 		String htmltext = null;
@@ -170,11 +170,8 @@ public final class Q00763_ADauntingTask extends Quest
 					htmltext = getAlreadyCompletedMsg(player, QuestType.DAILY);
 				}
 				else
-				{
-					if (!isSimulated)
 				{
 					st.setState(State.CREATED);
-					}
 					htmltext = "33851-01.htm";
 				}
 				break;

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/Q10322_SearchingForTheMysteriousPower.java

@@ -150,7 +150,7 @@ public final class Q10322_SearchingForTheMysteriousPower extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = null;
@@ -230,8 +230,6 @@ public final class Q10322_SearchingForTheMysteriousPower extends Quest
 							break;
 						}
 						case 6:
-						{
-							if (!isSimulated)
 						{
 							showOnScreenMsg(player, NpcStringId.WEAPONS_HAVE_BEEN_ADDED_TO_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 4500);
 							giveItems(player, WOODEN_ARROW, 500);
@@ -246,7 +244,6 @@ public final class Q10322_SearchingForTheMysteriousPower extends Quest
 							addExpAndSp(player, 300, 5);
 							npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THERE_S_THE_NEXT_TRAINING_STEP);
 							qs.exitQuest(false, true);
-							}
 							htmltext = "33464-06.html";
 							break;
 						}

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/Q10323_TrainLikeItsReal.java

@@ -143,7 +143,7 @@ public final class Q10323_TrainLikeItsReal extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = null;
@@ -183,20 +183,14 @@ public final class Q10323_TrainLikeItsReal extends Quest
 							break;
 						}
 						case 4:
-						{
-							if (!isSimulated)
 						{
 							qs.setCond(6, true);
-							}
 							htmltext = "33194-06.html";
 							break;
 						}
 						case 5:
-						{
-							if (!isSimulated)
 						{
 							qs.setCond(7, true);
-							}
 							htmltext = "33194-06.html";
 							break;
 						}

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/Q10325_SearchingForNewPower.java

@@ -128,7 +128,7 @@ public final class Q10325_SearchingForNewPower extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = null;
@@ -150,8 +150,6 @@ public final class Q10325_SearchingForNewPower extends Quest
 					case GALLINT:
 					{
 						if (qs.isCond(8))
-						{
-							if (!isSimulated)
 						{
 							if (player.isMageClass())
 							{
@@ -164,7 +162,6 @@ public final class Q10325_SearchingForNewPower extends Quest
 							addExpAndSp(player, 4654, 5);
 							giveAdena(player, 120, true);
 							qs.exitQuest(false, true);
-							}
 							htmltext = "32980-04.html";
 							break;
 						}
@@ -179,11 +176,8 @@ public final class Q10325_SearchingForNewPower extends Quest
 						if (player.getRace() == Race.HUMAN)
 						{
 							if ((qs.isCond(2)))
-							{
-								if (!isSimulated)
 							{
 								qs.setCond(8);
-								}
 								htmltext = "32156-01.html";
 								break;
 							}
@@ -198,11 +192,8 @@ public final class Q10325_SearchingForNewPower extends Quest
 						if (player.getRace() == Race.ELF)
 						{
 							if ((qs.isCond(3)))
-							{
-								if (!isSimulated)
 							{
 								qs.setCond(8);
-								}
 								htmltext = "32148-01.html";
 								break;
 							}
@@ -217,11 +208,8 @@ public final class Q10325_SearchingForNewPower extends Quest
 						if (player.getRace() == Race.DARK_ELF)
 						{
 							if ((qs.isCond(4)))
-							{
-								if (!isSimulated)
 							{
 								qs.setCond(8);
-								}
 								htmltext = "32161-01.html";
 								break;
 							}
@@ -236,11 +224,8 @@ public final class Q10325_SearchingForNewPower extends Quest
 						if (player.getRace() == Race.ORC)
 						{
 							if ((qs.isCond(5)))
-							{
-								if (!isSimulated)
 							{
 								qs.setCond(8);
-								}
 								htmltext = "32151-01.html";
 								break;
 							}
@@ -255,11 +240,8 @@ public final class Q10325_SearchingForNewPower extends Quest
 						if (player.getRace() == Race.DWARF)
 						{
 							if ((qs.isCond(6)))
-							{
-								if (!isSimulated)
 							{
 								qs.setCond(8);
-								}
 								htmltext = "32159-01.html";
 								break;
 							}
@@ -274,11 +256,8 @@ public final class Q10325_SearchingForNewPower extends Quest
 						if (player.getRace() == Race.KAMAEL)
 						{
 							if ((qs.isCond(7)))
-							{
-								if (!isSimulated)
 							{
 								qs.setCond(8);
-								}
 								htmltext = "32144-01.html";
 								break;
 							}

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java

@@ -97,7 +97,7 @@ public final class Q10336_DividedSakumKanilov extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);
@@ -121,12 +121,9 @@ public final class Q10336_DividedSakumKanilov extends Quest
 					case 2:
 					{
 						if (npc.getId() == ZENATH)
-						{
-							if (!isSimulated)
 						{
 							st.setCond(3);
 							giveItems(player, SAKUM_SKETCH, 1);
-							}
 							htmltext = "33509-05.html";
 						}
 						else

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java

@@ -106,7 +106,7 @@ public final class Q10339_FightingTheForgotten extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState st = getQuestState(player, true);
 		String htmltext = null;
@@ -141,13 +141,10 @@ public final class Q10339_FightingTheForgotten extends Quest
 							htmltext = "33344-02.html";
 							break;
 						case 3:
-						{
-							if (!isSimulated)
 						{
 							st.exitQuest(false, true);
 							giveAdena(player, 528_210, true);
 							addExpAndSp(player, 238_423_500, 57_221);
-							}
 							htmltext = "33344-03.html";
 							break;
 						}

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java

@@ -83,7 +83,7 @@ public final class Q10341_DayOfDestinyHumansFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, true);
@@ -106,6 +106,6 @@ public final class Q10341_DayOfDestinyHumansFate extends ThirdClassTransferQuest
 				}
 			}
 		}
-		return (!htmltext.equals(getNoQuestMsg(player)) ? htmltext : super.onTalk(npc, player, isSimulated));
+		return (!htmltext.equals(getNoQuestMsg(player)) ? htmltext : super.onTalk(npc, player));
 	}
 }

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java

@@ -83,7 +83,7 @@ public final class Q10342_DayOfDestinyElvenFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, true);
@@ -106,6 +106,6 @@ public final class Q10342_DayOfDestinyElvenFate extends ThirdClassTransferQuest
 				}
 			}
 		}
-		return (!htmltext.equals(getNoQuestMsg(player)) ? htmltext : super.onTalk(npc, player, isSimulated));
+		return (!htmltext.equals(getNoQuestMsg(player)) ? htmltext : super.onTalk(npc, player));
 	}
 }

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java

@@ -83,7 +83,7 @@ public final class Q10343_DayOfDestinyDarkElfsFate extends ThirdClassTransferQue
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, true);
@@ -106,6 +106,6 @@ public final class Q10343_DayOfDestinyDarkElfsFate extends ThirdClassTransferQue
 				}
 			}
 		}
-		return (!htmltext.equals(getNoQuestMsg(player)) ? htmltext : super.onTalk(npc, player, isSimulated));
+		return (!htmltext.equals(getNoQuestMsg(player)) ? htmltext : super.onTalk(npc, player));
 	}
 }

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java

@@ -83,7 +83,7 @@ public final class Q10344_DayOfDestinyOrcsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, true);
@@ -106,6 +106,6 @@ public final class Q10344_DayOfDestinyOrcsFate extends ThirdClassTransferQuest
 				}
 			}
 		}
-		return (!htmltext.equals(getNoQuestMsg(player)) ? htmltext : super.onTalk(npc, player, isSimulated));
+		return (!htmltext.equals(getNoQuestMsg(player)) ? htmltext : super.onTalk(npc, player));
 	}
 }

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java

@@ -83,7 +83,7 @@ public final class Q10345_DayOfDestinyDwarfsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, true);
@@ -106,6 +106,6 @@ public final class Q10345_DayOfDestinyDwarfsFate extends ThirdClassTransferQuest
 				}
 			}
 		}
-		return (!htmltext.equals(getNoQuestMsg(player)) ? htmltext : super.onTalk(npc, player, isSimulated));
+		return (!htmltext.equals(getNoQuestMsg(player)) ? htmltext : super.onTalk(npc, player));
 	}
 }

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java

@@ -83,7 +83,7 @@ public final class Q10346_DayOfDestinyKamaelsFate extends ThirdClassTransferQues
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, true);
@@ -106,6 +106,6 @@ public final class Q10346_DayOfDestinyKamaelsFate extends ThirdClassTransferQues
 				}
 			}
 		}
-		return (!htmltext.equals(getNoQuestMsg(player)) ? htmltext : super.onTalk(npc, player, isSimulated));
+		return (!htmltext.equals(getNoQuestMsg(player)) ? htmltext : super.onTalk(npc, player));
 	}
 }

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java

@@ -98,7 +98,7 @@ public final class Q10358_DividedSakumPoslof extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);
@@ -122,12 +122,9 @@ public final class Q10358_DividedSakumPoslof extends Quest
 					case 2:
 					{
 						if (npc.getId() == LEF)
-						{
-							if (!isSimulated)
 						{
 							st.setCond(3);
 							giveItems(player, SAKUM_SKETCH, 1);
-							}
 							htmltext = "33510-05.html";
 						}
 						else if (npc.getId() == ADVENTURER_GUIDE)

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java

@@ -134,7 +134,7 @@ public final class Q10359_TracesOfEvil extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);
@@ -177,54 +177,32 @@ public final class Q10359_TracesOfEvil extends Quest
 								switch (player.getRace())
 								{
 									case HUMAN:
-										if (!isSimulated)
-										{
 										st.setCond(player.isMageClass() ? 4 : 5);
-										}
 										htmltext = player.isMageClass() ? "33179-06.htm" : "33179-11.htm";
 										break;
 									case DARK_ELF:
-										if (!isSimulated)
-										{
 										st.setCond(6);
-										}
 										htmltext = "33179-05.htm";
 										break;
 									case ORC:
-										if (!isSimulated)
-										{
 										st.setCond(7);
-										}
 										htmltext = "33179-07.htm";
 										break;
 									case DWARF:
-										if (!isSimulated)
-										{
 										st.setCond(8);
-										}
 										htmltext = "33179-08.htm";
 										break;
 									case KAMAEL:
-										if (!isSimulated)
-										{
 										st.setCond(9);
-										}
 										htmltext = "33179-09.htm";
 										break;
 									case ELF:
-										if (!isSimulated)
-										{
 										st.setCond(player.isMageClass() ? 11 : 10);
-										}
 										htmltext = player.isMageClass() ? "33179-12.htm" : "33179-10.htm";
 										break;
 								}
-								
-								if (!isSimulated)
-								{
 								takeItems(player, FRAGMENT, 20);
 								playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE);
-								}
 								break;
 							}
 						}

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java

@@ -143,7 +143,7 @@ public final class Q10362_CertificationOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = null;
@@ -170,12 +170,9 @@ public final class Q10362_CertificationOfTheSeeker extends Quest
 							break;
 						}
 						case 2:
-						{
-							if (!isSimulated)
 						{
 							showOnScreenMsg(player, NpcStringId.USE_THE_YE_SAGIRA_TELEPORT_DEVICE_TO_GO_TO_EXPLORATION_AREA_2, ExShowScreenMessage.TOP_CENTER, 4500);
 							qs.setCond(3, true);
-							}
 							htmltext = "33449-05.html";
 							break;
 						}

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java

@@ -265,7 +265,7 @@ public final class Q10369_NoblesseSoulTesting extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, true);
@@ -306,14 +306,11 @@ public final class Q10369_NoblesseSoulTesting extends Quest
 									htmltext = "31281-10.html";
 									break;
 								case 14:
-									if (!isSimulated)
-									{
 									final Quest instance = QuestManager.getInstance().getQuest(EvasHiddenSpace.class.getSimpleName());
 									if (instance != null)
 									{
 										instance.onAdvEvent("enterInstance", npc, player);
 									}
-									}
 									htmltext = null;
 									break;
 								case 17:
@@ -339,8 +336,6 @@ public final class Q10369_NoblesseSoulTesting extends Quest
 									htmltext = "33686-06.html";
 									break;
 								case 18:
-									if (!isSimulated)
-									{
 									player.doCast(NOBLESSE_PRESENTATION.getSkill());
 									showOnScreenMsg(player, NpcStringId.CONGRATULATIONS_YOU_ARE_NOW_A_NOBLESSE, ExShowScreenMessage.TOP_CENTER, 5000);
 									player.setNoble(true);
@@ -351,7 +346,6 @@ public final class Q10369_NoblesseSoulTesting extends Quest
 									giveItems(player, STEEL_COIN, 87);
 									addExpAndSp(player, 12_625_440, 0);
 									qs.exitQuest(false, true);
-									}
 									htmltext = "33686-07.html";
 									break;
 							}
@@ -380,13 +374,10 @@ public final class Q10369_NoblesseSoulTesting extends Quest
 									htmltext = "33696-10.html";
 									break;
 								case 13:
-									if (!isSimulated)
-									{
 									qs.setCond(14, true);
 									takeItems(player, HARD_FOSSIL_CONTAINING_WATER_ENERGY, -1);
 									giveItems(player, SACK_CONTAINING_INGREDIENTS, 1);
 									giveItems(player, SOE_SECRET_ROOM, 1);
-									}
 									htmltext = "33696-11.html";
 									break;
 							}

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java

@@ -425,7 +425,7 @@ public final class Q10385_RedThreadOfFate extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, true);

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java

@@ -111,7 +111,7 @@ public final class Q10386_MysteriousJourney extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);
@@ -149,8 +149,6 @@ public final class Q10386_MysteriousJourney extends Quest
 								htmltext = "33780-05.html";
 								break;
 							case 4:
-							{
-								if (!isSimulated)
 							{
 								giveAdena(player, 58_707, true);
 								giveItems(player, EWR, 1);
@@ -159,7 +157,6 @@ public final class Q10386_MysteriousJourney extends Quest
 									addExpAndSp(player, 27_244_350, 6_538);
 								}
 								st.exitQuest(false, true);
-								}
 								htmltext = "33780-06.html";
 								break;
 							}

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java

@@ -137,7 +137,7 @@ public final class Q10387_SoullessOne extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState st = getQuestState(player, true);

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java

@@ -93,7 +93,7 @@ public final class Q10409_ASuspiciousVagabondInTheSwamp extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState st = getQuestState(player, true);
 		String htmltext = null;
@@ -115,11 +115,8 @@ public final class Q10409_ASuspiciousVagabondInTheSwamp extends Quest
 					htmltext = st.isCond(1) ? "33847-05.html" : "33847-06.html";
 				}
 				else if ((npc.getId() == VAGABOND) && st.isCond(1))
-				{
-					if (!isSimulated)
 				{
 					st.setCond(2, true);
-					}
 					htmltext = "33848-01.html";
 				}
 				break;

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java

@@ -93,7 +93,7 @@ public final class Q10412_ASuspiciousVagabondInTheForest extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState st = getQuestState(player, true);
 		String htmltext = null;
@@ -115,11 +115,8 @@ public final class Q10412_ASuspiciousVagabondInTheForest extends Quest
 					htmltext = st.isCond(1) ? "33849-05.html" : "33849-06.html";
 				}
 				else if ((npc.getId() == VAGABOND) && st.isCond(1))
-				{
-					if (!isSimulated)
 				{
 					st.setCond(2, true);
-					}
 					htmltext = "33850-01.html";
 				}
 				break;

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java

@@ -114,7 +114,7 @@ public final class Q10734_DoOrDie extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
@@ -135,41 +135,29 @@ public final class Q10734_DoOrDie extends Quest
 							switch (qs.getCond())
 							{
 								case 1:
-								{
-									if (!isSimulated)
 								{
 									showOnScreenMsg(player, NpcStringId.ATTACK_THE_TRAINING_DUMMY, ExShowScreenMessage.TOP_CENTER, 10000);
-									}
 									htmltext = "33943-04.html";
 									break;
 								}
 								case 3:
-								{
-									if (!isSimulated)
 								{
 									showOnScreenMsg(player, NpcStringId.TALK_TO_THE_APPRENTICE_ADVENTURER_S_GUIDE, ExShowScreenMessage.TOP_CENTER, 10000);
 									qs.setCond(5, true);
-									}
 									htmltext = "33943-05.html";
 									break;
 								}
 								case 5:
-								{
-									if (!isSimulated)
 								{
 									showOnScreenMsg(player, NpcStringId.TALK_TO_THE_APPRENTICE_ADVENTURER_S_GUIDE, ExShowScreenMessage.TOP_CENTER, 10000);
-									}
 									htmltext = "33943-06.html";
 									break;
 								}
 								case 8:
-								{
-									if (!isSimulated)
 								{
 									giveAdena(player, 7000, true);
 									addExpAndSp(player, 805, 2);
 									qs.exitQuest(false, true);
-									}
 									htmltext = "33943-07.html";
 									break;
 								}
@@ -197,41 +185,29 @@ public final class Q10734_DoOrDie extends Quest
 							switch (qs.getCond())
 							{
 								case 1:
-								{
-									if (!isSimulated)
 								{
 									showOnScreenMsg(player, NpcStringId.ATTACK_THE_TRAINING_DUMMY, ExShowScreenMessage.TOP_CENTER, 10000);
-									}
 									htmltext = "33942-04.html";
 									break;
 								}
 								case 2:
-								{
-									if (!isSimulated)
 								{
 									showOnScreenMsg(player, NpcStringId.TALK_TO_THE_APPRENTICE_ADVENTURER_S_GUIDE, ExShowScreenMessage.TOP_CENTER, 10000);
 									qs.setCond(4, true);
-									}
 									htmltext = "33942-05.html";
 									break;
 								}
 								case 4:
-								{
-									if (!isSimulated)
 								{
 									showOnScreenMsg(player, NpcStringId.TALK_TO_THE_APPRENTICE_ADVENTURER_S_GUIDE, ExShowScreenMessage.TOP_CENTER, 10000);
-									}
 									htmltext = "33942-06.html";
 									break;
 								}
 								case 7:
-								{
-									if (!isSimulated)
 								{
 									giveAdena(player, 7000, true);
 									addExpAndSp(player, 805, 2);
 									qs.exitQuest(false, true);
-									}
 									htmltext = "33942-07.html";
 									break;
 								}
@@ -258,11 +234,8 @@ public final class Q10734_DoOrDie extends Quest
 							break;
 						}
 						case 6:
-						{
-							if (!isSimulated)
 						{
 							showOnScreenMsg(player, NpcStringId.ATTACK_THE_TRAINING_DUMMY, ExShowScreenMessage.TOP_CENTER, 10000);
-							}
 							htmltext = castBuffs(npc, player, "33950-07.html", "33950-08.html");
 							break;
 						}

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java

@@ -76,7 +76,7 @@ public final class Q10735_ASpecialPower extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
@@ -107,14 +107,11 @@ public final class Q10735_ASpecialPower extends Quest
 						break;
 					}
 					case 7:
-					{
-						if (!isSimulated)
 					{
 						giveAdena(player, 900, true);
 						rewardItems(player, SPIRITSHOTS_REWARD);
 						addExpAndSp(player, 3154, 0);
 						qs.exitQuest(false, true);
-						}
 						htmltext = "33942-05.html";
 						break;
 					}

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java

@@ -75,7 +75,7 @@ public final class Q10736_ASpecialPower extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
@@ -104,14 +104,11 @@ public final class Q10736_ASpecialPower extends Quest
 						break;
 					}
 					case 7:
-					{
-						if (!isSimulated)
 					{
 						giveAdena(player, 900, true);
 						rewardItems(player, SOULSHOTS_REWARD);
 						addExpAndSp(player, 3154, 0);
 						qs.exitQuest(false, true);
-						}
 						htmltext = "33943-05.html";
 						break;
 					}

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java

@@ -120,7 +120,7 @@ public final class Q10739_SupplyAndDemand extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
@@ -190,8 +190,6 @@ public final class Q10739_SupplyAndDemand extends Quest
 			}
 			case SIVANTHE:
 				if (qs.isStarted() && qs.isCond(4))
-				{
-					if (!isSimulated)
 				{
 					giveItems(player, LEATHER_SHIRT);
 					giveItems(player, LEATHER_PANTS);
@@ -201,7 +199,6 @@ public final class Q10739_SupplyAndDemand extends Quest
 					addExpAndSp(player, 8136, 0);
 					showOnScreenMsg(player, NpcStringId.CHECK_YOUR_EQUIPMENT_IN_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 10000);
 					qs.exitQuest(false, true);
-					}
 					htmltext = "33951-01.html";
 				}
 				else if (qs.isCompleted())

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java

@@ -105,7 +105,7 @@ public final class Q10740_NeverForget extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
@@ -134,8 +134,6 @@ public final class Q10740_NeverForget extends Quest
 								break;
 							}
 							case 3:
-							{
-								if (!isSimulated)
 							{
 								showOnScreenMsg(player, NpcStringId.CHECK_YOUR_EQUIPMENT_IN_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 10000);
 								giveAdena(player, 1600, true);
@@ -143,7 +141,6 @@ public final class Q10740_NeverForget extends Quest
 								giveItems(player, HEALING_POTION);
 								addExpAndSp(player, 16851, 0);
 								qs.exitQuest(false, true);
-								}
 								htmltext = "33951-06.html";
 								break;
 							}

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java

@@ -173,7 +173,7 @@ public final class Q10742_AFurryFriend extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
@@ -192,13 +192,10 @@ public final class Q10742_AFurryFriend extends Quest
 						htmltext = "33952-06.html";
 					}
 					else if (qs.isCond(2))
-					{
-						if (!isSimulated)
 					{
 						giveAdena(player, 2500, true);
 						addExpAndSp(player, 52516, 5);
 						qs.exitQuest(false, true);
-						}
 						htmltext = "33952-04.html";
 					}
 					break;

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java

@@ -88,7 +88,7 @@ public final class Q10744_StrongerThanSteel extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
@@ -125,13 +125,10 @@ public final class Q10744_StrongerThanSteel extends Quest
 						htmltext = "33954-04.html";
 					}
 					else if (qs.isCond(3))
-					{
-						if (!isSimulated)
 					{
 						giveAdena(player, 34000, true);
 						addExpAndSp(player, 112001, 5);
 						qs.exitQuest(false, true);
-						}
 						htmltext = "33954-05.html";
 					}
 				}

L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java

@@ -88,7 +88,7 @@ public final class Q10746_SeeTheWorld extends Quest
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
+	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
@@ -121,11 +121,8 @@ public final class Q10746_SeeTheWorld extends Quest
 				if (qs.isStarted())
 				{
 					if (qs.isCond(1))
-					{
-						if (!isSimulated)
 					{
 						qs.setCond(2, true);
-						}
 						htmltext = "33948-01.html";
 					}
 					else if (qs.isCond(2))
@@ -138,8 +135,6 @@ public final class Q10746_SeeTheWorld extends Quest
 			case LEVIAN:
 			{
 				if (qs.isStarted() && qs.isCond(2))
-				{
-					if (!isSimulated)
 				{
 					giveAdena(player, 43000, true);
 					addExpAndSp(player, 53422, 5);
@@ -153,7 +148,6 @@ public final class Q10746_SeeTheWorld extends Quest
 					}
 					showOnScreenMsg(player, NpcStringId.CHECK_YOUR_EQUIPMENT_IN_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 10000);
 					qs.exitQuest(false, true);
-					}
 					htmltext = "30037-01.html";
 				}
 				else if (qs.isCompleted())