From 14c015645d6c8b9d0569d18c2de687bb49299fa1 Mon Sep 17 00:00:00 2001 From: Jules Date: Wed, 22 Feb 2023 23:40:37 +0100 Subject: [PATCH] Reduced confusion for guild module --- .../src/main/java/net/Indyuce/mmocore/guild/GuildModule.java | 2 ++ .../Indyuce/mmocore/guild/compat/KingdomsXGuildModule.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/guild/GuildModule.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/guild/GuildModule.java index e3dae11d..c16a9cb0 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/guild/GuildModule.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/guild/GuildModule.java @@ -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); } diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/guild/compat/KingdomsXGuildModule.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/guild/compat/KingdomsXGuildModule.java index a8530800..97c0b48b 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/guild/compat/KingdomsXGuildModule.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/guild/compat/KingdomsXGuildModule.java @@ -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)