Add channel setting to disable cross server

Also defaults integration channels to not broadcast
Hexaoxide · Sep 17, 2024 · 36009b6 · 36009b6
1 parent c216b0c
commit 36009b6
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 0 deletions.
diff --git a/common/src/main/java/net/draycia/carbon/common/channels/ConfigChatChannel.java b/common/src/main/java/net/draycia/carbon/common/channels/ConfigChatChannel.java
@@ -117,6 +117,8 @@ public class ConfigChatChannel implements ChatChannel {
 
     private long cooldown = -1;
 
+    private Key broadcastCrossServer = true;
+
     @Override
     public @Nullable String quickPrefix() {
         if (this.quickPrefix == null || this.quickPrefix.isBlank()) {
@@ -263,6 +265,10 @@ public boolean emptyRadiusRecipientsMessage() {
         return this.emptyRadiusRecipientsMessage;
     }
 
+    public boolean broadcastCrossServer() {
+        return this.broadcastCrossServer;
+    }
+
     @Override
     public boolean equals(final Object other) {
         if (!(other instanceof ConfigChatChannel otherChannel)) {

diff --git a/common/src/main/java/net/draycia/carbon/common/listeners/MessagePacketHandler.java b/common/src/main/java/net/draycia/carbon/common/listeners/MessagePacketHandler.java
@@ -50,6 +50,11 @@ public MessagePacketHandler(
             if (event.sender() instanceof ConsoleCarbonPlayer) {
                 return;
             }
+            if (event.channel() instanceof ConfigChatChannel configChannel) {
+                if (!configChannel.broadcastCrossServer()) {
+                    return;
+                }
+            }
 
             messaging.get().queuePacket(() -> {
                 final CarbonPlayer sender = event.sender();

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
@@ -48,4 +48,9 @@ protected final boolean hasRelations(final CarbonPlayer player, final Relation r
         return faction != null && faction.getRelationCount(relation) > 0;
     }
 
+    @Override
+    public boolean broadcastCrossServer() {
+        return false;
+    }
+
 }
diff --git a/paper/src/main/java/net/draycia/carbon/paper/integration/mcmmo/McmmoPartyChannel.java b/paper/src/main/java/net/draycia/carbon/paper/integration/mcmmo/McmmoPartyChannel.java
@@ -101,4 +101,9 @@ public List<Audience> recipients(final CarbonPlayer sender) {
         return PartyManager.getParty(Bukkit.getPlayer(player.uuid()));
     }
 
+    @Override
+    public boolean broadcastCrossServer() {
+        return false;
+    }
+
 }
diff --git a/paper/src/main/java/net/draycia/carbon/paper/integration/towny/ResidentListChannel.java b/paper/src/main/java/net/draycia/carbon/paper/integration/towny/ResidentListChannel.java
@@ -91,4 +91,9 @@ protected List<Player> onlinePlayers(final T residentList) {
 
     protected abstract Component cannotUseChannel(CarbonPlayer player);
 
+    @Override
+    public boolean broadcastCrossServer() {
+        return false;
+    }
+
 }