Upstream/mmocore
1
0
Fork 1
mirror of https://gitlab.com/phoenix-dvpmt/mmocore.git synced 2024-10-22 20:10:00 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reduced confusion for guild module

Browse Source
This commit is contained in:
Jules 2023-02-22 23:40:37 +01:00
parent 05355688e2
commit 14c015645d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MMOCore-API/src/main/java/net/Indyuce/mmocore/guild/GuildModule.java
View File

@ -3,6 +3,7 @@ package net.Indyuce.mmocore.guild;
import io.lumine.mythic.lib.comp.interaction.relation.Relationship;
import net.Indyuce.mmocore.api.player.PlayerData;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public interface GuildModule {
@ -10,5 +11,6 @@ public interface GuildModule {
@Nullable
public AbstractGuild getGuild(PlayerData playerData);
@NotNull
public Relationship getRelationship(Player player, Player target);
}

4
MMOCore-API/src/main/java/net/Indyuce/mmocore/guild/compat/KingdomsXGuildModule.java
View File

@ -30,7 +30,7 @@ public class KingdomsXGuildModule implements GuildModule {
final KingdomPlayer player1 = Kingdoms.get().getDataHandlers().getKingdomPlayerManager().getData(player.getUniqueId());
if (player1 == null)
return null;
return Relationship.GUILD_NEUTRAL;
final Kingdom kingdom1 = player1.getKingdom();
if (kingdom1 == null)
@ -38,7 +38,7 @@ public class KingdomsXGuildModule implements GuildModule {
final KingdomPlayer player2 = Kingdoms.get().getDataHandlers().getKingdomPlayerManager().getData(target.getUniqueId());
if (player2 == null)
return null;
return Relationship.GUILD_NEUTRAL;
final Kingdom kingdom2 = player2.getKingdom();
if (kingdom2 == null)