Fork/mmocore
2
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

Fixed guild loading

Browse Source
This commit is contained in:
Indyuce 2020-05-09 19:13:37 +02:00
parent ac17103be8
commit b3f1687aa9
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/Indyuce/mmocore/MMOCore.java
View File

@ -282,6 +282,11 @@ public class MMOCore extends JavaPlugin {
*/ */
Bukkit.getOnlinePlayers().forEach(player -> dataProvider.getDataManager().setup(player)); Bukkit.getOnlinePlayers().forEach(player -> dataProvider.getDataManager().setup(player));
/*
* load guild data after loading player data
*/
dataProvider.getGuildManager().load();
// commands // commands
try { try {
final Field bukkitCommandMap = Bukkit.getServer().getClass().getDeclaredField("commandMap"); final Field bukkitCommandMap = Bukkit.getServer().getClass().getDeclaredField("commandMap");

5
src/main/java/net/Indyuce/mmocore/manager/data/GuildDataManager.java
View File

@ -55,6 +55,7 @@ public abstract class GuildDataManager {
return guilds.values(); return guilds.values();
} }
@Deprecated
public void reload() { public void reload() {
for (Guild guild : guilds.values()) for (Guild guild : guilds.values())
save(guild); save(guild);
@ -75,9 +76,7 @@ public abstract class GuildDataManager {
private GuildConfiguration config; private GuildConfiguration config;
public GuildConfiguration getConfig() { public GuildConfiguration getConfig() {
if (config == null) return config == null ? config = new GuildConfiguration() : config;
config = new GuildConfiguration();
return config;
} }
public class GuildConfiguration { public class GuildConfiguration {