From 97c8bfe67b2ad814c655ba7bca3927b98f39c187 Mon Sep 17 00:00:00 2001 From: fatpigsarefat Date: Sun, 24 Jun 2018 21:31:31 +0100 Subject: Might have fixed a bug. Not sure (could never recreate it). Closes #18 --- .../quests/player/QPlayerManager.java | 48 ++++++++++++---------- src/plugin.yml | 2 +- 2 files changed, 27 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/me/fatpigsarefat/quests/player/QPlayerManager.java b/src/me/fatpigsarefat/quests/player/QPlayerManager.java index e463d338..29c6f01a 100644 --- a/src/me/fatpigsarefat/quests/player/QPlayerManager.java +++ b/src/me/fatpigsarefat/quests/player/QPlayerManager.java @@ -37,32 +37,36 @@ public class QPlayerManager { if (getPlayer(uuid) == null || getPlayer(uuid).isOnlyDataLoaded()) { QuestProgressFile questProgressFile = new QuestProgressFile(uuid); - File directory = new File(Quests.getInstance().getDataFolder() + File.separator + "playerdata"); - if (directory.exists() && directory.isDirectory()) { - File file = new File(Quests.getInstance().getDataFolder() + File.separator + "playerdata" + File.separator + uuid.toString() + ".yml"); - if (file.exists()) { - YamlConfiguration data = YamlConfiguration.loadConfiguration(file); - if (data.contains("quest-progress")) { - for (String id : data.getConfigurationSection("quest-progress").getKeys(false)) { - boolean started = data.getBoolean("quest-progress." + id + ".started"); - boolean completed = data.getBoolean("quest-progress." + id + ".completed"); - boolean completedBefore = data.getBoolean("quest-progress." + id + ".completed-before"); - long completionDate = data.getLong("quest-progress." + id + ".completion-date"); - - QuestProgress questProgress = new QuestProgress(id, completed, completedBefore, completionDate, uuid, started, true); - - for (String taskid : data.getConfigurationSection("quest-progress." + id + ".task-progress").getKeys(false)) { - boolean taskCompleted = data.getBoolean("quest-progress." + id + ".task-progress." + taskid + ".completed"); - Object taskProgression = data.get("quest-progress." + id + ".task-progress." + taskid + ".progress"); - - TaskProgress taskProgress = new TaskProgress(taskid, taskProgression, uuid, taskCompleted); - questProgress.addTaskProgress(taskProgress); + try { + File directory = new File(Quests.getInstance().getDataFolder() + File.separator + "playerdata"); + if (directory.exists() && directory.isDirectory()) { + File file = new File(Quests.getInstance().getDataFolder() + File.separator + "playerdata" + File.separator + uuid.toString() + ".yml"); + if (file.exists()) { + YamlConfiguration data = YamlConfiguration.loadConfiguration(file); + if (data.contains("quest-progress")) { + for (String id : data.getConfigurationSection("quest-progress").getKeys(false)) { + boolean started = data.getBoolean("quest-progress." + id + ".started"); + boolean completed = data.getBoolean("quest-progress." + id + ".completed"); + boolean completedBefore = data.getBoolean("quest-progress." + id + ".completed-before"); + long completionDate = data.getLong("quest-progress." + id + ".completion-date"); + + QuestProgress questProgress = new QuestProgress(id, completed, completedBefore, completionDate, uuid, started, true); + + for (String taskid : data.getConfigurationSection("quest-progress." + id + ".task-progress").getKeys(false)) { + boolean taskCompleted = data.getBoolean("quest-progress." + id + ".task-progress." + taskid + ".completed"); + Object taskProgression = data.get("quest-progress." + id + ".task-progress." + taskid + ".progress"); + + TaskProgress taskProgress = new TaskProgress(taskid, taskProgression, uuid, taskCompleted); + questProgress.addTaskProgress(taskProgress); + } + + questProgressFile.addQuestProgress(questProgress); } - - questProgressFile.addQuestProgress(questProgress); } } } + } catch (Exception ignored) { + // fuck } QPlayer qPlayer = new QPlayer(uuid, questProgressFile, onlyData); diff --git a/src/plugin.yml b/src/plugin.yml index fc55db22..83d7c268 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,5 +1,5 @@ name: Quests -version: 2.0.9-beta +version: 2.0.10-beta main: me.fatpigsarefat.quests.Quests author: fatpigsarefat softdepend: [ASkyBlock, uSkyBlock] -- cgit v1.2.3-70-g09d2