From cd9acf0d2ba8a472445793eacbed95e5244e45b5 Mon Sep 17 00:00:00 2001
From: PikaMug <unconfigured@null.spigotmc.org>
Date: Sat, 4 Jan 2020 22:29:52 -0500
Subject: [PATCH] Correct showing of location names for kill-mob objectives,
 fixes #1030

---
 main/src/main/java/me/blackvein/quests/Quests.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/main/src/main/java/me/blackvein/quests/Quests.java b/main/src/main/java/me/blackvein/quests/Quests.java
index 7b77241c3..5dedf7b4e 100644
--- a/main/src/main/java/me/blackvein/quests/Quests.java
+++ b/main/src/main/java/me/blackvein/quests/Quests.java
@@ -962,10 +962,11 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
                                         + (data.mobNumKilled.get(data.mobsKilled.indexOf(e2))) 
                                         + "/" + (stage.mobNumToKill.get(stage.mobsToKill.indexOf(e)));
                             } else {
-                                message = color + Lang.get(quester.getPlayer(), "killAtLocation") + " " 
-                                        + ChatColor.AQUA + "<mob>" + color + ": " 
-                                        + (data.mobNumKilled.get(data.mobsKilled.indexOf(e2))) 
-                                        + "/" + (stage.mobNumToKill.get(stage.mobsToKill.indexOf(e)));
+                                message = color + Lang.get(quester.getPlayer(), "killAtLocation") + color + ": " 
+                                        + (data.mobNumKilled.get(data.mobsKilled.indexOf(e2))) + "/" 
+                                        + (stage.mobNumToKill.get(stage.mobsToKill.indexOf(e)));
+                                message = message.replace("<location>", 
+                                        stage.killNames.get(stage.mobsToKill.indexOf(e)));
                             }
                         }
                         if (depends.getPlaceholderApi() != null) {
@@ -974,8 +975,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
                         if (getSettings().canTranslateItems()) {
                             localeQuery.sendMessage(quester.getPlayer(), message, e, null);
                         } else {
-                            quester.getPlayer().sendMessage(message.replace("<mob>", 
-                                    MiscUtil.getProperMobName(e)));
+                            quester.getPlayer().sendMessage(message.replace("<mob>", MiscUtil.getProperMobName(e)));
                         }
                     }
                 }