Fix debug report after last changes

2 files changed, 24 insertions, 23 deletions

diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminDebugReportCommandHandler.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminDebugReportCommandHandler.java
index 94efda58..5efca13e 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminDebugReportCommandHandler.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminDebugReportCommandHandler.java
@@ -236,32 +236,23 @@ public class AdminDebugReportCommandHandler implements CommandHandler {
                 printMap(lines, 1, "Preferences", getFieldValues(preferences.getClass(), preferences));
 
                 QuestProgressFile questProgressFile = qPlayer.getQuestProgressFile();
-                try {
-                    Field questProgressField = questProgressFile.getClass().getDeclaredField("questProgress");
-                    questProgressField.setAccessible(true);
-                    Map<String, QuestProgress> questProgressMap = (Map<String, QuestProgress>) questProgressField.get(questProgressFile);
-                    Map<String, Object> questProgressValues = new LinkedHashMap<>();
-                    for (Map.Entry<String, QuestProgress> entry : questProgressMap.entrySet()) {
-                        QuestProgress questProgress = entry.getValue();
-                        Map<String, Object> questProgressValue = getFieldValues(questProgress.getClass(), questProgress, "plugin", "taskProgress");
-
-                        Field taskProgressField = questProgress.getClass().getDeclaredField("taskProgress");
-                        taskProgressField.setAccessible(true);
-                        Map<String, TaskProgress> taskProgressMap = (Map<String, TaskProgress>) taskProgressField.get(questProgress);
-                        Map<String, Object> taskProgressValues = new LinkedHashMap<>();
-                        for (Map.Entry<String, TaskProgress> taskEntry : taskProgressMap.entrySet()) {
-                            TaskProgress taskProgress = taskEntry.getValue();
-                            taskProgressValues.put(taskEntry.getKey(), getFieldValues(taskProgress.getClass(), taskProgress, "plugin", "linkedQuestProgress"));
-                        }
-                        questProgressValue.put("taskProgress", taskProgressValues);
+                Map<String, QuestProgress> questProgressMap = questProgressFile.getQuestProgressMap();
+                Map<String, Object> questProgressValues = new LinkedHashMap<>();
+                for (Map.Entry<String, QuestProgress> entry : questProgressMap.entrySet()) {
+                    QuestProgress questProgress = entry.getValue();
+                    Map<String, Object> questProgressValue = getFieldValues(questProgress.getClass(), questProgress, "plugin", "taskProgressMap");
 
-                        questProgressValues.put(entry.getKey(), questProgressValue);
+                    Map<String, TaskProgress> taskProgressMap = questProgress.getTaskProgressMap();
+                    Map<String, Object> taskProgressValues = new LinkedHashMap<>();
+                    for (Map.Entry<String, TaskProgress> taskEntry : taskProgressMap.entrySet()) {
+                        TaskProgress taskProgress = taskEntry.getValue();
+                        taskProgressValues.put(taskEntry.getKey(), getFieldValues(taskProgress.getClass(), taskProgress, "plugin", "questProgress"));
                     }
-                    printMap(lines, 1, "Quest progress", questProgressValues);
-                } catch (NoSuchFieldException | IllegalAccessException e) {
-                    error("Failed to get quest progress for QPlayer " + qPlayer.getPlayerUUID() + ": " + e.getClass().getSimpleName() + "(" + e.getMessage() + ")");
-                    e.printStackTrace();
+                    questProgressValue.put("taskProgress", taskProgressValues);
+
+                    questProgressValues.put(entry.getKey(), questProgressValue);
                 }
+                printMap(lines, 1, "Quest progress", questProgressValues);
                 lines.add("    Quest controller: " + qPlayer.getQuestController().getName());
                 lines.add("");
             }
diff --git a/common/src/main/java/com/leonardobishop/quests/common/player/questprogressfile/QuestProgressFile.java b/common/src/main/java/com/leonardobishop/quests/common/player/questprogressfile/QuestProgressFile.java
index e4b6add0..4a1dfc23 100644
--- a/common/src/main/java/com/leonardobishop/quests/common/player/questprogressfile/QuestProgressFile.java
+++ b/common/src/main/java/com/leonardobishop/quests/common/player/questprogressfile/QuestProgressFile.java
@@ -163,6 +163,16 @@ public final class QuestProgressFile {
     }
 
     /**
+     * Gets map of quest id to quest progress.
+     *
+     * @return {@code Map<String, QuestProgress>} quest progress map
+     */
+    @Contract(pure = true)
+    public Map<String, QuestProgress> getQuestProgressMap() {
+        return this.questProgressMap;
+    }
+
+    /**
      * Gets all the quest progress that it has ever encountered.
      *
      * @return {@code Collection<QuestProgress>} all quest progresses