mirror of
https://gitlab.com/phoenix-dvpmt/mmocore.git
synced 2024-10-22 20:10:00 +02:00
Reduced confusion for guild module
This commit is contained in:
parent
05355688e2
commit
14c015645d
@ -3,6 +3,7 @@ package net.Indyuce.mmocore.guild;
|
|||||||
import io.lumine.mythic.lib.comp.interaction.relation.Relationship;
|
import io.lumine.mythic.lib.comp.interaction.relation.Relationship;
|
||||||
import net.Indyuce.mmocore.api.player.PlayerData;
|
import net.Indyuce.mmocore.api.player.PlayerData;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
public interface GuildModule {
|
public interface GuildModule {
|
||||||
@ -10,5 +11,6 @@ public interface GuildModule {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public AbstractGuild getGuild(PlayerData playerData);
|
public AbstractGuild getGuild(PlayerData playerData);
|
||||||
|
|
||||||
|
@NotNull
|
||||||
public Relationship getRelationship(Player player, Player target);
|
public Relationship getRelationship(Player player, Player target);
|
||||||
}
|
}
|
||||||
|
@ -30,7 +30,7 @@ public class KingdomsXGuildModule implements GuildModule {
|
|||||||
|
|
||||||
final KingdomPlayer player1 = Kingdoms.get().getDataHandlers().getKingdomPlayerManager().getData(player.getUniqueId());
|
final KingdomPlayer player1 = Kingdoms.get().getDataHandlers().getKingdomPlayerManager().getData(player.getUniqueId());
|
||||||
if (player1 == null)
|
if (player1 == null)
|
||||||
return null;
|
return Relationship.GUILD_NEUTRAL;
|
||||||
|
|
||||||
final Kingdom kingdom1 = player1.getKingdom();
|
final Kingdom kingdom1 = player1.getKingdom();
|
||||||
if (kingdom1 == null)
|
if (kingdom1 == null)
|
||||||
@ -38,7 +38,7 @@ public class KingdomsXGuildModule implements GuildModule {
|
|||||||
|
|
||||||
final KingdomPlayer player2 = Kingdoms.get().getDataHandlers().getKingdomPlayerManager().getData(target.getUniqueId());
|
final KingdomPlayer player2 = Kingdoms.get().getDataHandlers().getKingdomPlayerManager().getData(target.getUniqueId());
|
||||||
if (player2 == null)
|
if (player2 == null)
|
||||||
return null;
|
return Relationship.GUILD_NEUTRAL;
|
||||||
|
|
||||||
final Kingdom kingdom2 = player2.getKingdom();
|
final Kingdom kingdom2 = player2.getKingdom();
|
||||||
if (kingdom2 == null)
|
if (kingdom2 == null)
|
||||||
|
Loading…
Reference in New Issue
Block a user