From 38f0bd5873cf2d3141df9436174a5141fce3079e Mon Sep 17 00:00:00 2001
From: Niels Vergucht <vergucht.niels@gmail.com>
Date: Fri, 7 Dec 2018 19:53:10 +0100
Subject: [PATCH] Fixed shops not loading on start

---
 src/main/java/com/songoda/epicbuckets/EpicBuckets.java    | 4 +++-
 .../java/com/songoda/epicbuckets/file/ConfigManager.java  | 8 +++-----
 .../java/com/songoda/epicbuckets/shop/ShopManager.java    | 3 ++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/songoda/epicbuckets/EpicBuckets.java b/src/main/java/com/songoda/epicbuckets/EpicBuckets.java
index 5c2fdd6..985a790 100644
--- a/src/main/java/com/songoda/epicbuckets/EpicBuckets.java
+++ b/src/main/java/com/songoda/epicbuckets/EpicBuckets.java
@@ -44,6 +44,8 @@ public class EpicBuckets extends ExtendedJavaPlugin {
             return;
         }
 
+        saveDefaultConfig();
+
         Locale.init(this);
         Locale.saveDefaultLocale("en_US");
         this.locale = Locale.getLocale(getConfig().getString("Locale", "en_US"));
@@ -51,7 +53,7 @@ public class EpicBuckets extends ExtendedJavaPlugin {
         debugger = new Debugger();
         configManager = new ConfigManager();
         shopManager = new ShopManager();
-        shopManager.init();
+        configManager.setup();
         genbucketManager = new GenbucketManager();
         commandManager = new PaperCommandManager(this);
 
diff --git a/src/main/java/com/songoda/epicbuckets/file/ConfigManager.java b/src/main/java/com/songoda/epicbuckets/file/ConfigManager.java
index 8cdea1d..2dcd6a8 100644
--- a/src/main/java/com/songoda/epicbuckets/file/ConfigManager.java
+++ b/src/main/java/com/songoda/epicbuckets/file/ConfigManager.java
@@ -53,17 +53,15 @@ public class ConfigManager {
 
     public ConfigManager() {
         this.epicBuckets = EpicBuckets.getInstance();
-
-        setup();
     }
 
-    private void setup() {
-        epicBuckets.saveDefaultConfig();
+    public void setup() {
         configDatabase = new HashMap<>();
-        loadData();
         createConfig("shops", true);
+        loadData();
         setupBackButton();
         setupFillItem();
+        epicBuckets.getShopManager().init();
     }
 
     public void reload() {
diff --git a/src/main/java/com/songoda/epicbuckets/shop/ShopManager.java b/src/main/java/com/songoda/epicbuckets/shop/ShopManager.java
index a4ca07d..8b29601 100644
--- a/src/main/java/com/songoda/epicbuckets/shop/ShopManager.java
+++ b/src/main/java/com/songoda/epicbuckets/shop/ShopManager.java
@@ -91,13 +91,14 @@ public class ShopManager {
     }
 
     private void loadShops() {
+        System.out.println("Loading shops..");
         for (String key : epicBuckets.getConfig().getConfigurationSection(epicBuckets.getConfigManager().getMenuItemsPath()).getKeys(false)) {
             if (!epicBuckets.getConfig().isConfigurationSection(epicBuckets.getConfigManager().getMenuItemsPath() + "." + key)) {
                 continue;
             }
-
             shopDatabase.put(key, new Shop(key, epicBuckets.getConfig().getString(epicBuckets.getConfigManager().getMenuItemsPath() + "." + key + ".shop"), epicBuckets.getConfigManager().getMenuItemsPath() + "." + key));
         }
+        System.out.println("Loaded " + shopDatabase.size() + " shop(s)");
     }
 
     public boolean inventoryFull(Player buyer) {