From b352adda94af3637eb04d9221513f4c7559f9b42 Mon Sep 17 00:00:00 2001
From: PikaMug <unconfigured@null.spigotmc.org>
Date: Wed, 22 Jan 2020 23:31:25 -0500
Subject: [PATCH] Allow color codes and tags in objective-overrides, part 2.
 Per #1047

---
 main/src/main/java/me/blackvein/quests/Quester.java | 13 ++++++++++---
 main/src/main/java/me/blackvein/quests/Quests.java  |  3 +--
 2 files changed, 11 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 df9342ae8..e70b4073b 100644
--- a/main/src/main/java/me/blackvein/quests/Quester.java
+++ b/main/src/main/java/me/blackvein/quests/Quester.java
@@ -578,7 +578,13 @@ public class Quester {
             if (getCurrentStage(quest) != null) {
                 if (getCurrentStage(quest).objectiveOverride != null) {
                     LinkedList<String> objectives = new LinkedList<String>();
-                    objectives.add(ChatColor.GREEN + getCurrentStage(quest).objectiveOverride);
+                    String message = ChatColor.GREEN + ConfigUtil.parseString(
+                            ChatColor.translateAlternateColorCodes('&', getCurrentStage(quest).objectiveOverride), 
+                            quest, getPlayer());
+                    if (plugin.getDependencies().getPlaceholderApi() != null) {
+                        message = PlaceholderAPI.setPlaceholders(getPlayer(), message);
+                    }
+                    objectives.add(message);
                     return objectives;
                 }
             }
@@ -2073,8 +2079,9 @@ public class Quester {
             String pass, CustomObjective co) {
         Player p = getPlayer();
         if (getCurrentStage(quest).objectiveOverride != null) {
-            String message = ChatColor.GREEN + "(" + Lang.get(p, "completed") + ") " + getCurrentStage(quest)
-                    .objectiveOverride;
+            String message = ChatColor.GREEN + "(" + Lang.get(p, "completed") + ") " 
+                    + ConfigUtil.parseString(ChatColor.translateAlternateColorCodes('&', 
+                    getCurrentStage(quest).objectiveOverride), quest, p);
             if (plugin.getDependencies().getPlaceholderApi() != null) {
                 message = PlaceholderAPI.setPlaceholders(p, message);
             }
diff --git a/main/src/main/java/me/blackvein/quests/Quests.java b/main/src/main/java/me/blackvein/quests/Quests.java
index 334fd16b3..98c908d5b 100644
--- a/main/src/main/java/me/blackvein/quests/Quests.java
+++ b/main/src/main/java/me/blackvein/quests/Quests.java
@@ -663,8 +663,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
         }
         if (!ignoreOverrides) {
             if (quester.getCurrentStage(quest).objectiveOverride != null) {
-                String message = ChatColor.GREEN + ConfigUtil.parseString(ChatColor.GREEN 
-                        + ChatColor.translateAlternateColorCodes('&', 
+                String message = ChatColor.GREEN + ConfigUtil.parseString(ChatColor.translateAlternateColorCodes('&', 
                         quester.getCurrentStage(quest).objectiveOverride), quest, quester.getPlayer());
                 if (depends.getPlaceholderApi() != null) {
                     message = PlaceholderAPI.setPlaceholders(quester.getPlayer(), message);