From 4c1170040093b2e25a2f5ded4e305352c5fa770d Mon Sep 17 00:00:00 2001 From: PikaMug Date: Wed, 5 Jun 2019 00:27:39 -0400 Subject: [PATCH] Undo 537fecb754fe5acf4ca6a76d8035509fb041ef8e per #811 --- main/src/main/java/me/blackvein/quests/Quester.java | 9 +++++++++ .../src/main/java/me/blackvein/quests/util/ItemUtil.java | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/main/src/main/java/me/blackvein/quests/Quester.java b/main/src/main/java/me/blackvein/quests/Quester.java index ac6db603f..1d9c03c7f 100644 --- a/main/src/main/java/me/blackvein/quests/Quester.java +++ b/main/src/main/java/me/blackvein/quests/Quester.java @@ -2323,6 +2323,15 @@ public class Quester { completedQuests.clear(); } if (data.isString("currentQuests") == false) { + List questNames = data.getStringList("currentQuests"); + List questStages = data.getIntegerList("currentStages"); + // These appear to differ sometimes? That seems bad. + int maxSize = Math.min(questNames.size(), questStages.size()); + for (int i = 0; i < maxSize; i++) { + if (plugin.getQuest(questNames.get(i)) != null) { + currentQuests.put(plugin.getQuest(questNames.get(i)), questStages.get(i)); + } + } ConfigurationSection dataSec = data.getConfigurationSection("questData"); if (dataSec == null || dataSec.getKeys(false).isEmpty()) { return false; diff --git a/main/src/main/java/me/blackvein/quests/util/ItemUtil.java b/main/src/main/java/me/blackvein/quests/util/ItemUtil.java index 13ad0e9fc..ea5267776 100644 --- a/main/src/main/java/me/blackvein/quests/util/ItemUtil.java +++ b/main/src/main/java/me/blackvein/quests/util/ItemUtil.java @@ -417,7 +417,7 @@ public class ItemUtil { /** * Returns a formatted display name. If none exists, returns item name. * Also returns formatted durability and amount. - * A;so includes formatted enchantments. + * Also includes formatted enchantments. * * Format is ([display]name:durability) with (enchantments:levels) x (amount) *