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("", ChatColor.LIGHT_PURPLE + Quester.prettyMobString(e)); - obj = obj.replace("", getCurrentStage(quest).areaNames.get(getCurrentStage(quest).mobsToKill.indexOf(e))); + obj = obj.replace("", 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("", ChatColor.LIGHT_PURPLE + Quester.prettyMobString(e)); - obj = obj.replace("", getCurrentStage(quest).areaNames.get(getCurrentStage(quest).mobsToKill.indexOf(e))); + obj = obj.replace("", 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, Integer> enchants = new HashMap, Integer>(); for (Enchantment e : enchantments) { Map map = new HashMap(); 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 mobNumToKill = new LinkedList(); protected LinkedList locationsToKillWithin = new LinkedList(); protected LinkedList radiiToKillWithin = new LinkedList(); - protected LinkedList areaNames = new LinkedList(); + protected LinkedList killNames = new LinkedList(); protected LinkedList locationsToReach = new LinkedList(); protected LinkedList radiiToReachWithin = new LinkedList(); protected LinkedList worldsToReachWithin = new LinkedList(); @@ -270,13 +270,27 @@ public class Stage { public void setRadiiToKillWithin(LinkedList radiiToKillWithin) { this.radiiToKillWithin = radiiToKillWithin; } - - public LinkedList getAreaNames() { - return areaNames; + + public LinkedList getKillNames() { + return killNames; } - public void setAreaNames(LinkedList areaNames) { - this.areaNames = areaNames; + public void setKillNames(LinkedList killNames) { + this.killNames = killNames; + } + + /** + * @deprecated use getKillNames() + */ + public LinkedList getAreaNames() { + return killNames; + } + + /** + * @deprecated use setKillNames() + */ + public void setAreaNames(LinkedList killNames) { + this.killNames = killNames; } public LinkedList getLocationsToReach() {