From b3f1687aa94c8ac1ac2b17c48fea8bbd787f713e Mon Sep 17 00:00:00 2001
From: Indyuce <cym.peyrat@yahoo.fr>
Date: Sat, 9 May 2020 19:13:37 +0200
Subject: [PATCH] Fixed guild loading

---
 src/main/java/net/Indyuce/mmocore/MMOCore.java               | 5 +++++
 .../net/Indyuce/mmocore/manager/data/GuildDataManager.java   | 5 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/Indyuce/mmocore/MMOCore.java b/src/main/java/net/Indyuce/mmocore/MMOCore.java
index 4079846d..3de9aa0c 100644
--- a/src/main/java/net/Indyuce/mmocore/MMOCore.java
+++ b/src/main/java/net/Indyuce/mmocore/MMOCore.java
@@ -282,6 +282,11 @@ public class MMOCore extends JavaPlugin {
 		 */
 		Bukkit.getOnlinePlayers().forEach(player -> dataProvider.getDataManager().setup(player));
 
+		/*
+		 * load guild data after loading player data
+		 */
+		dataProvider.getGuildManager().load();
+
 		// commands
 		try {
 			final Field bukkitCommandMap = Bukkit.getServer().getClass().getDeclaredField("commandMap");
diff --git a/src/main/java/net/Indyuce/mmocore/manager/data/GuildDataManager.java b/src/main/java/net/Indyuce/mmocore/manager/data/GuildDataManager.java
index 8fbc45a8..6e898fb0 100644
--- a/src/main/java/net/Indyuce/mmocore/manager/data/GuildDataManager.java
+++ b/src/main/java/net/Indyuce/mmocore/manager/data/GuildDataManager.java
@@ -55,6 +55,7 @@ public abstract class GuildDataManager {
 		return guilds.values();
 	}
 
+	@Deprecated
 	public void reload() {
 		for (Guild guild : guilds.values())
 			save(guild);
@@ -75,9 +76,7 @@ public abstract class GuildDataManager {
 	private GuildConfiguration config;
 
 	public GuildConfiguration getConfig() {
-		if (config == null)
-			config = new GuildConfiguration();
-		return config;
+		return config == null ? config = new GuildConfiguration() : config;
 	}
 
 	public class GuildConfiguration {