Merge branch 'master' into 'master'

Fix the issue where players who are not currently connected to the server cannot be expelled from the guild

See merge request phoenix-dvpmt/mmocore!34
This commit is contained in:
woobeen Jeon 2025-11-12 15:07:20 +00:00
commit 88b6471172

View File

@ -64,8 +64,8 @@ public class Guild implements AbstractGuild {
// Disband boolean is to prevent co-modification exception when disbanding a guild
public void removeMember(UUID uuid, boolean disband) {
PlayerData data = PlayerData.get(uuid);
if (data.isOnline() && VersionUtils.getOpen(data.getPlayer()).getTopInventory().getHolder() instanceof EditableGuildView.GuildViewInventory)
PlayerData data = MMOCore.plugin.playerDataManager.getOrNull(uuid);
if (data != null && data.isOnline() && VersionUtils.getOpen(data.getPlayer()).getTopInventory().getHolder() instanceof EditableGuildView.GuildViewInventory)
InventoryManager.GUILD_CREATION.newInventory(data).open();
if (!disband)