From 1ab775d5ef3cf529929f2f16532e13ff5624eb31 Mon Sep 17 00:00:00 2001
From: LMBishop <13875753+LMBishop@users.noreply.github.com>
Date: Mon, 26 Jul 2021 20:07:06 +0100
Subject: Fix categories.yml not generating

---
 .../quests/bukkit/BukkitQuestsPlugin.java              |  4 ++++
 .../quests/bukkit/config/BukkitQuestsLoader.java       | 18 +++++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'bukkit/src/main/java/com')

diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java
index cf30af2a..ca0c95ce 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java
@@ -466,6 +466,10 @@ public class BukkitQuestsPlugin extends JavaPlugin implements Quests {
         if (!config.exists()) {
             writeResourceToFile("resources/bukkit/config.yml", config);
         }
+        File categories = new File(this.getDataFolder() + File.separator + "categories.yml");
+        if (!categories.exists()) {
+            writeResourceToFile("resources/bukkit/categories.yml", categories);
+        }
 
         File questsDirectory = new File(this.getDataFolder() + File.separator + "quests");
         if (!questsDirectory.exists() && !questsDirectory.isDirectory()) {
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/config/BukkitQuestsLoader.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/config/BukkitQuestsLoader.java
index d1f893b0..f035bf03 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/config/BukkitQuestsLoader.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/config/BukkitQuestsLoader.java
@@ -82,16 +82,16 @@ public class BukkitQuestsLoader implements QuestsLoader {
 
         ConfigurationSection categories;
         File categoriesFile = new File(plugin.getDataFolder() + File.separator + "categories.yml");
-        if (categoriesFile.exists()) {
-            YamlConfiguration categoriesConfiguration = YamlConfiguration.loadConfiguration(categoriesFile);
-            if (categoriesConfiguration.isConfigurationSection("categories")) {
-                categories = categoriesConfiguration.getConfigurationSection("categories");
-            } else {
-                categories = new YamlConfiguration();
-            }
+        if (plugin.getConfig().isConfigurationSection("categories")) {
+            categories = plugin.getConfig().getConfigurationSection("categories");
         } else {
-            if (plugin.getConfig().isConfigurationSection("categories")) {
-                categories = plugin.getConfig().getConfigurationSection("categories");
+            if (categoriesFile.exists()) {
+                YamlConfiguration categoriesConfiguration = YamlConfiguration.loadConfiguration(categoriesFile);
+                if (categoriesConfiguration.isConfigurationSection("categories")) {
+                    categories = categoriesConfiguration.getConfigurationSection("categories");
+                } else {
+                    categories = new YamlConfiguration();
+                }
             } else {
                 categories = new YamlConfiguration();
             }
-- 
cgit v1.2.3-70-g09d2