Check if faction has alliances/truces

Hexaoxide · Nov 14, 2023 · ae1ac89 · ae1ac89
1 parent c5bfdbd
commit ae1ac89
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/paper/src/main/java/net/draycia/carbon/paper/integration/fuuid/AbstractFactionsChannel.java b/paper/src/main/java/net/draycia/carbon/paper/integration/fuuid/AbstractFactionsChannel.java
@@ -22,6 +22,7 @@
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.FPlayers;
 import com.massivecraft.factions.Faction;
+import com.massivecraft.factions.perms.Relation;
 import net.draycia.carbon.api.users.CarbonPlayer;
 import net.draycia.carbon.common.channels.ConfigChatChannel;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -41,4 +42,10 @@ abstract class AbstractFactionsChannel extends ConfigChatChannel {
         return fPlayer.getFaction();
     }
 
+    protected final boolean hasRelations(final CarbonPlayer player, final Relation relation) {
+        final @Nullable Faction faction = this.faction(player);
+
+        return faction != null && faction.getRelationCount(relation) > 0;
+    }
+
 }
diff --git a/paper/src/main/java/net/draycia/carbon/paper/integration/fuuid/AllianceChannel.java b/paper/src/main/java/net/draycia/carbon/paper/integration/fuuid/AllianceChannel.java
@@ -67,22 +67,22 @@ public AllianceChannel() {
     @Override
     public ChannelPermissionResult speechPermitted(final CarbonPlayer player) {
         return channelPermissionResult(
-            this.hasAllies(player),
+            this.hasRelations(player, Relation.ALLY),
             () -> this.messages.cannotUseFactionAllianceChannel(player)
         );
     }
 
     @Override
     public ChannelPermissionResult hearingPermitted(final CarbonPlayer player) {
         return channelPermissionResult(
-            this.hasAllies(player),
+            this.hasRelations(player, Relation.ALLY),
             () -> this.messages.cannotUseFactionAllianceChannel(player)
         );
     }
 
     @Override
     public List<Audience> recipients(final CarbonPlayer sender) {
-        if (!this.hasAllies(sender)) {
+        if (!this.hasRelations(sender, Relation.ALLY)) {
             if (sender.online()) {
                 sender.sendMessage(this.messages.cannotUseFactionAllianceChannel(sender));
             }
@@ -124,10 +124,4 @@ private List<Player> alliedPlayersTo(final CarbonPlayer player) {
         return alliedPlayers;
     }
 
-    private boolean hasAllies(final CarbonPlayer player) {
-        final @Nullable Faction faction = this.faction(player);
-
-        return faction != null && faction.getRelationCount(Relation.ALLY) > 0;
-    }
-
 }
diff --git a/paper/src/main/java/net/draycia/carbon/paper/integration/fuuid/TruceChannel.java b/paper/src/main/java/net/draycia/carbon/paper/integration/fuuid/TruceChannel.java
@@ -67,24 +67,22 @@ public TruceChannel() {
     @Override
     public ChannelPermissionResult speechPermitted(final CarbonPlayer player) {
         return channelPermissionResult(
-            this.faction(player) != null,
+            this.hasRelations(player, Relation.TRUCE),
             () -> this.messages.cannotUseTruceChannel(player)
         );
     }
 
     @Override
     public ChannelPermissionResult hearingPermitted(final CarbonPlayer player) {
         return channelPermissionResult(
-            this.faction(player) != null,
+            this.hasRelations(player, Relation.TRUCE),
             () -> this.messages.cannotUseTruceChannel(player)
         );
     }
 
     @Override
     public List<Audience> recipients(final CarbonPlayer sender) {
-        final @Nullable Faction faction = this.faction(sender);
-
-        if (faction == null) {
+        if (!this.hasRelations(sender, Relation.TRUCE)) {
             if (sender.online()) {
                 sender.sendMessage(this.messages.cannotUseTruceChannel(sender));
             }