Upstream/mmocore
1
0
Fork 1
mirror of https://gitlab.com/phoenix-dvpmt/mmocore.git synced 2025-02-01 11:11:23 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed guild loading NPE

Browse Source
This commit is contained in:
Jules 2023-04-14 15:45:04 +02:00
parent 99f83a722a
commit 0bcd11cf68
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/GuildDataManager.java
View File

@ -11,6 +11,8 @@ import org.bukkit.configuration.file.FileConfiguration;
import net.Indyuce.mmocore.api.ConfigFile; import net.Indyuce.mmocore.api.ConfigFile;
import net.Indyuce.mmocore.guild.provided.Guild; import net.Indyuce.mmocore.guild.provided.Guild;
import javax.annotation.Nullable;
public abstract class GuildDataManager { public abstract class GuildDataManager {
protected final Map<String, Guild> guilds = new HashMap<>(); protected final Map<String, Guild> guilds = new HashMap<>();
@ -39,6 +41,7 @@ public abstract class GuildDataManager {
delete(guild); delete(guild);
} }
@Nullable
public Guild getGuild(String guild) { public Guild getGuild(String guild) {
return guilds.get(guild); return guilds.get(guild);
} }

3
MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MMOCoreDataSynchronizer.java
View File

@ -78,7 +78,8 @@ public class MMOCoreDataSynchronizer extends DataSynchronizer {
} }
data.setUnlockedItems(unlockedItems); data.setUnlockedItems(unlockedItems);
if (!isEmpty(result.getString("guild"))) { if (!isEmpty(result.getString("guild"))) {
Guild guild = MMOCore.plugin.dataProvider.getGuildManager().getGuild(result.getString("guild")); final Guild guild = MMOCore.plugin.dataProvider.getGuildManager().getGuild(result.getString("guild"));
if (guild != null)
data.setGuild(guild.hasMember(data.getUniqueId()) ? guild : null); data.setGuild(guild.hasMember(data.getUniqueId()) ? guild : null);
} }
if (!isEmpty(result.getString("attributes"))) if (!isEmpty(result.getString("attributes")))