From f6f7bfc5eb58e5c12067aad196cb6befa585cc78 Mon Sep 17 00:00:00 2001
From: BuildTools <unconfigured@null.spigotmc.org>
Date: Sun, 27 Jan 2019 23:24:01 -0500
Subject: [PATCH] Clarify Stage variable for kill location names

---
 .../me/blackvein/quests/QuestFactory.java     |  2 +-
 .../java/me/blackvein/quests/Quester.java     |  4 +--
 src/main/java/me/blackvein/quests/Quests.java |  2 +-
 src/main/java/me/blackvein/quests/Stage.java  | 26 ++++++++++++++-----
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/main/java/me/blackvein/quests/QuestFactory.java b/src/main/java/me/blackvein/quests/QuestFactory.java
index d9c3e7805..36d5cab57 100644
--- a/src/main/java/me/blackvein/quests/QuestFactory.java
+++ b/src/main/java/me/blackvein/quests/QuestFactory.java
@@ -1587,7 +1587,7 @@ public class QuestFactory implements ConversationAbandonedListener {
 					}
 					cc.setSessionData(pref + CK.S_MOB_KILL_LOCATIONS, locs);
 					cc.setSessionData(pref + CK.S_MOB_KILL_LOCATIONS_RADIUS, stage.radiiToKillWithin);
-					cc.setSessionData(pref + CK.S_MOB_KILL_LOCATIONS_NAMES, stage.areaNames);
+					cc.setSessionData(pref + CK.S_MOB_KILL_LOCATIONS_NAMES, stage.killNames);
 				}
 			}
 			if (stage.locationsToReach.isEmpty() == false) {
diff --git a/src/main/java/me/blackvein/quests/Quester.java b/src/main/java/me/blackvein/quests/Quester.java
index bb776ebb8..91a2b7a7e 100644
--- a/src/main/java/me/blackvein/quests/Quester.java
+++ b/src/main/java/me/blackvein/quests/Quester.java
@@ -675,7 +675,7 @@ public class Quester {
 							} else {
 								String obj = Lang.get(getPlayer(), "killAtLocation");
 								obj = obj.replace("<mob>", ChatColor.LIGHT_PURPLE + Quester.prettyMobString(e));
-								obj = obj.replace("<location>", getCurrentStage(quest).areaNames.get(getCurrentStage(quest).mobsToKill.indexOf(e)));
+								obj = obj.replace("<location>", getCurrentStage(quest).killNames.get(getCurrentStage(quest).mobsToKill.indexOf(e)));
 								unfinishedObjectives.add(ChatColor.GREEN + obj + ChatColor.GREEN + ": " 
 										+ (getQuestData(quest).mobNumKilled.get(getQuestData(quest).mobsKilled.indexOf(e2))) 
 										+ "/" + (getCurrentStage(quest).mobNumToKill.get(getCurrentStage(quest).mobsToKill.indexOf(e))));
@@ -689,7 +689,7 @@ public class Quester {
 							} else {
 								String obj = Lang.get(getPlayer(), "killAtLocation");
 								obj = obj.replace("<mob>", ChatColor.LIGHT_PURPLE + Quester.prettyMobString(e));
-								obj = obj.replace("<location>", getCurrentStage(quest).areaNames.get(getCurrentStage(quest).mobsToKill.indexOf(e)));
+								obj = obj.replace("<location>", getCurrentStage(quest).killNames.get(getCurrentStage(quest).mobsToKill.indexOf(e)));
 								finishedObjectives.add(ChatColor.GRAY + obj + ChatColor.GRAY + ": " 
 										+ (getQuestData(quest).mobNumKilled.get(getQuestData(quest).mobsKilled.indexOf(e2))) 
 										+ "/" + (getCurrentStage(quest).mobNumToKill.get(getCurrentStage(quest).mobsToKill.indexOf(e))));
diff --git a/src/main/java/me/blackvein/quests/Quests.java b/src/main/java/me/blackvein/quests/Quests.java
index b892c1b3e..d60838390 100644
--- a/src/main/java/me/blackvein/quests/Quests.java
+++ b/src/main/java/me/blackvein/quests/Quests.java
@@ -1750,7 +1750,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
 			oStage.mobNumToKill = mobNumToKill;
 			oStage.locationsToKillWithin = locationsToKillWithin;
 			oStage.radiiToKillWithin = radiiToKillWithin;
-			oStage.areaNames = areaNames;
+			oStage.killNames = areaNames;
 			Map<Map<Enchantment, Material>, Integer> enchants = new HashMap<Map<Enchantment, Material>, Integer>();
 			for (Enchantment e : enchantments) {
 				Map<Enchantment, Material> map = new HashMap<Enchantment, Material>();
diff --git a/src/main/java/me/blackvein/quests/Stage.java b/src/main/java/me/blackvein/quests/Stage.java
index fb62d0056..44bdc890d 100644
--- a/src/main/java/me/blackvein/quests/Stage.java
+++ b/src/main/java/me/blackvein/quests/Stage.java
@@ -100,7 +100,7 @@ public class Stage {
 	protected LinkedList<Integer> mobNumToKill = new LinkedList<Integer>();
 	protected LinkedList<Location> locationsToKillWithin = new LinkedList<Location>();
 	protected LinkedList<Integer> radiiToKillWithin = new LinkedList<Integer>();
-	protected LinkedList<String> areaNames = new LinkedList<String>();
+	protected LinkedList<String> killNames = new LinkedList<String>();
 	protected LinkedList<Location> locationsToReach = new LinkedList<Location>();
 	protected LinkedList<Integer> radiiToReachWithin = new LinkedList<Integer>();
 	protected LinkedList<World> worldsToReachWithin = new LinkedList<World>();
@@ -270,13 +270,27 @@ public class Stage {
 	public void setRadiiToKillWithin(LinkedList<Integer> radiiToKillWithin) {
 		this.radiiToKillWithin = radiiToKillWithin;
 	}
-
-	public LinkedList<String> getAreaNames() {
-		return areaNames;
+	
+	public LinkedList<String> getKillNames() {
+		return killNames;
 	}
 
-	public void setAreaNames(LinkedList<String> areaNames) {
-		this.areaNames = areaNames;
+	public void setKillNames(LinkedList<String> killNames) {
+		this.killNames = killNames;
+	}
+
+	/**
+	 * @deprecated use getKillNames()
+	 */
+	public LinkedList<String> getAreaNames() {
+		return killNames;
+	}
+
+	/**
+	 * @deprecated use setKillNames()
+	 */
+	public void setAreaNames(LinkedList<String> killNames) {
+		this.killNames = killNames;
 	}
 
 	public LinkedList<Location> getLocationsToReach() {