From 97f941cbaa96d6a5d6f9e10b7c2dc0eccde796c6 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 14 Aug 2017 20:08:45 +0000
Subject: [PATCH] Improved QuestLink buypass handler.

---
 .../handlers/bypasshandlers/QuestLink.java    | 28 +++++++++++--------
 .../handlers/bypasshandlers/QuestLink.java    | 28 +++++++++++--------
 .../handlers/bypasshandlers/QuestLink.java    | 28 +++++++++++--------
 3 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
index 0d67cac2a3..87d48e691d 100644
--- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
+++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
@@ -87,10 +87,9 @@ 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;
+		int questCounter = 0;
 		
 		//@formatter:off
 		final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
@@ -127,8 +126,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;
+					questCounter++;
 				}
 				else
 				{
@@ -136,6 +135,7 @@ public class QuestLink implements IBypassHandler
 					sbCantStart.append("<button icon=\"quest\" align=\"left\" action=\"bypass -h npc_" + npc.getObjectId() + "_Quest " + quest.getName() + "\">");
 					sbCantStart.append(quest.isCustomQuest() ? quest.getPath() : "<fstring>" + quest.getNpcStringId() + "01</fstring>");
 					sbCantStart.append("</button></font>");
+					questCounter++;
 				}
 			}
 			else if (qs.isStarted())
@@ -144,8 +144,8 @@ public class QuestLink implements IBypassHandler
 				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;
+				questCounter++;
 			}
 			else if (qs.isCompleted())
 			{
@@ -153,18 +153,22 @@ public class QuestLink implements IBypassHandler
 				sbCompleted.append("<button icon=\"quest\" align=\"left\" action=\"bypass -h npc_" + npc.getObjectId() + "_Quest " + quest.getName() + "\">");
 				sbCompleted.append(quest.isCustomQuest() ? quest.getPath() + " (Done) " : "<fstring>" + quest.getNpcStringId() + "03</fstring>");
 				sbCompleted.append("</button></font>");
+				questCounter++;
 			}
 		}
 		
-		if ((availableQuestCounter == 0) && (inProgressQuestCounter == 1) && (lastSavedProgressQuest != null))
+		if (questCounter == 1)
 		{
-			showQuestWindow(player, npc, lastSavedProgressQuest.getName());
-			return;
-		}
-		if ((availableQuestCounter == 1) && (inProgressQuestCounter == 0) && (lastSavedAvailableQuest != null))
-		{
-			showQuestWindow(player, npc, lastSavedAvailableQuest.getName());
-			return;
+			if (lastSavedProgressQuest != null)
+			{
+				showQuestWindow(player, npc, lastSavedProgressQuest.getName());
+				return;
+			}
+			if (lastSavedAvailableQuest != null)
+			{
+				showQuestWindow(player, npc, lastSavedAvailableQuest.getName());
+				return;
+			}
 		}
 		
 		String content;
diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
index 1e36d0d631..c289fda3e7 100644
--- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
+++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
@@ -87,10 +87,9 @@ 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;
+		int questCounter = 0;
 		
 		//@formatter:off
 		final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
@@ -127,8 +126,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;
+					questCounter++;
 				}
 				else
 				{
@@ -136,6 +135,7 @@ public class QuestLink implements IBypassHandler
 					sbCantStart.append("<button icon=\"quest\" align=\"left\" action=\"bypass -h npc_" + npc.getObjectId() + "_Quest " + quest.getName() + "\">");
 					sbCantStart.append(quest.isCustomQuest() ? quest.getPath() : "<fstring>" + quest.getNpcStringId() + "01</fstring>");
 					sbCantStart.append("</button></font>");
+					questCounter++;
 				}
 			}
 			else if (qs.isStarted())
@@ -144,8 +144,8 @@ public class QuestLink implements IBypassHandler
 				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;
+				questCounter++;
 			}
 			else if (qs.isCompleted())
 			{
@@ -153,18 +153,22 @@ public class QuestLink implements IBypassHandler
 				sbCompleted.append("<button icon=\"quest\" align=\"left\" action=\"bypass -h npc_" + npc.getObjectId() + "_Quest " + quest.getName() + "\">");
 				sbCompleted.append(quest.isCustomQuest() ? quest.getPath() + " (Done) " : "<fstring>" + quest.getNpcStringId() + "03</fstring>");
 				sbCompleted.append("</button></font>");
+				questCounter++;
 			}
 		}
 		
-		if ((availableQuestCounter == 0) && (inProgressQuestCounter == 1) && (lastSavedProgressQuest != null))
+		if (questCounter == 1)
 		{
-			showQuestWindow(player, npc, lastSavedProgressQuest.getName());
-			return;
-		}
-		if ((availableQuestCounter == 1) && (inProgressQuestCounter == 0) && (lastSavedAvailableQuest != null))
-		{
-			showQuestWindow(player, npc, lastSavedAvailableQuest.getName());
-			return;
+			if (lastSavedProgressQuest != null)
+			{
+				showQuestWindow(player, npc, lastSavedProgressQuest.getName());
+				return;
+			}
+			if (lastSavedAvailableQuest != null)
+			{
+				showQuestWindow(player, npc, lastSavedAvailableQuest.getName());
+				return;
+			}
 		}
 		
 		String content;
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
index 1e36d0d631..c289fda3e7 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
@@ -87,10 +87,9 @@ 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;
+		int questCounter = 0;
 		
 		//@formatter:off
 		final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
@@ -127,8 +126,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;
+					questCounter++;
 				}
 				else
 				{
@@ -136,6 +135,7 @@ public class QuestLink implements IBypassHandler
 					sbCantStart.append("<button icon=\"quest\" align=\"left\" action=\"bypass -h npc_" + npc.getObjectId() + "_Quest " + quest.getName() + "\">");
 					sbCantStart.append(quest.isCustomQuest() ? quest.getPath() : "<fstring>" + quest.getNpcStringId() + "01</fstring>");
 					sbCantStart.append("</button></font>");
+					questCounter++;
 				}
 			}
 			else if (qs.isStarted())
@@ -144,8 +144,8 @@ public class QuestLink implements IBypassHandler
 				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;
+				questCounter++;
 			}
 			else if (qs.isCompleted())
 			{
@@ -153,18 +153,22 @@ public class QuestLink implements IBypassHandler
 				sbCompleted.append("<button icon=\"quest\" align=\"left\" action=\"bypass -h npc_" + npc.getObjectId() + "_Quest " + quest.getName() + "\">");
 				sbCompleted.append(quest.isCustomQuest() ? quest.getPath() + " (Done) " : "<fstring>" + quest.getNpcStringId() + "03</fstring>");
 				sbCompleted.append("</button></font>");
+				questCounter++;
 			}
 		}
 		
-		if ((availableQuestCounter == 0) && (inProgressQuestCounter == 1) && (lastSavedProgressQuest != null))
+		if (questCounter == 1)
 		{
-			showQuestWindow(player, npc, lastSavedProgressQuest.getName());
-			return;
-		}
-		if ((availableQuestCounter == 1) && (inProgressQuestCounter == 0) && (lastSavedAvailableQuest != null))
-		{
-			showQuestWindow(player, npc, lastSavedAvailableQuest.getName());
-			return;
+			if (lastSavedProgressQuest != null)
+			{
+				showQuestWindow(player, npc, lastSavedProgressQuest.getName());
+				return;
+			}
+			if (lastSavedAvailableQuest != null)
+			{
+				showQuestWindow(player, npc, lastSavedAvailableQuest.getName());
+				return;
+			}
 		}
 		
 		String content;