From c511fe735b15793897cb349a3f5381a1f0cdc61d Mon Sep 17 00:00:00 2001
From: PikaMug <2267126+PikaMug@users.noreply.github.com>
Date: Mon, 8 Mar 2021 04:39:00 -0500
Subject: [PATCH] Adjust password objective to progress to next stage, fixes
 #1635

---
 main/src/main/java/me/blackvein/quests/Quester.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/main/src/main/java/me/blackvein/quests/Quester.java b/main/src/main/java/me/blackvein/quests/Quester.java
index 3e7e1d9c1..15365fe0c 100644
--- a/main/src/main/java/me/blackvein/quests/Quester.java
+++ b/main/src/main/java/me/blackvein/quests/Quester.java
@@ -1304,9 +1304,8 @@ public class Quester implements Comparable<Quester> {
         for (final String s : getCurrentStage(quest).passwordDisplays) {
             if (data.passwordsSaid.containsKey(s)) {
                 final Boolean b = data.passwordsSaid.get(s);
-                final ChatColor color = b != null && !b == false ? ChatColor.GREEN : ChatColor.GRAY;
-                final String message = color + s;
-                objectives.add(message);
+                final ChatColor color = b != null && b == false ? ChatColor.GREEN : ChatColor.GRAY;
+                objectives.add(color + s);
             }
         }
         for (final CustomObjective co : getCurrentStage(quest).customObjectives) {
@@ -2826,8 +2825,6 @@ public class Quester implements Comparable<Quester> {
                 }
                 sendMessage(message);
             }
-        } else if (type.equals(ObjectiveType.PASSWORD)) {
-            sendMessage(ChatColor.GREEN + "(" + Lang.get(p, "completed") + ") " + pass);
         } else if (type.equals(ObjectiveType.BREAK_BLOCK)) {
             String message = ChatColor.GREEN + "(" + Lang.get(p, "completed") + ") " + Lang.get(p, "break");
             if (message.contains("<count>")) {
@@ -3101,6 +3098,8 @@ public class Quester implements Comparable<Quester> {
             }
             final String message = ChatColor.GREEN + "(" + Lang.get(p, "completed") + ") " + obj;
             sendMessage(message);
+        } else if (type.equals(ObjectiveType.PASSWORD)) {
+            sendMessage(ChatColor.GREEN + "(" + Lang.get(p, "completed") + ") " + pass);
         } else if (co != null) {
             String message = ChatColor.GREEN + "(" + Lang.get(p, "completed") + ") " + co.getDisplay();
             int index = -1;