Add radius spying

Hexaoxide · May 24, 2024 · f154ce5 · f154ce5
1 parent 4c96b88
commit f154ce5
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/common/src/main/java/net/draycia/carbon/common/listeners/RadiusListener.java b/common/src/main/java/net/draycia/carbon/common/listeners/RadiusListener.java
@@ -20,6 +20,8 @@
 package net.draycia.carbon.common.listeners;
 
 import com.google.inject.Inject;
+import java.util.ArrayList;
+import java.util.List;
 import net.draycia.carbon.api.event.CarbonEventHandler;
 import net.draycia.carbon.api.event.events.CarbonChatEvent;
 import net.draycia.carbon.api.users.CarbonPlayer;
@@ -46,14 +48,22 @@ public RadiusListener(
                 return;
             }
 
+            final List<CarbonPlayer> spyingPlayers = new ArrayList<>();
+
             if (radius == 0) {
                 event.recipients().removeIf(audience -> {
                     if (audience.equals(event.sender())) {
                         return false;
                     }
 
                     if (audience instanceof CarbonPlayer carbonPlayer) {
-                        return !carbonPlayer.sameWorldAs(event.sender());
+                        final boolean sameWorld = carbonPlayer.sameWorldAs(event.sender());
+
+                        if (!sameWorld && carbonPlayer.spying()) {
+                            spyingPlayers.add(carbonPlayer);
+                        }
+
+                        return !sameWorld;
                     }
 
                     return false;
@@ -66,18 +76,32 @@ public RadiusListener(
 
                     if (audience instanceof CarbonPlayer carbonPlayer) {
                         if (!event.sender().sameWorldAs(carbonPlayer)) {
+                            if (carbonPlayer.spying()) {
+                                spyingPlayers.add(carbonPlayer);
+                            }
                             return true;
                         }
 
                         final double distance = carbonPlayer.distanceSquaredFrom(event.sender());
-                        return distance > (radius * radius);
+                        final boolean outOfRange = distance > (radius * radius);
+
+                        if (outOfRange && carbonPlayer.spying()) {
+                            spyingPlayers.add(carbonPlayer);
+                        }
+
+                        return outOfRange;
                     }
 
                     return false;
                 });
             }
             if (event.recipients().size() <= 2 && event.chatChannel().emptyRadiusRecipientsMessage()) { // the player and cosole
                 carbonMessages.emptyRecipients(event.sender());
+                return;
+            }
+
+            for (final CarbonPlayer player : spyingPlayers) {
+                carbonMessages.radiusSpy(player, event.message());
             }
         });
     }

diff --git a/common/src/main/java/net/draycia/carbon/common/messages/CarbonMessages.java b/common/src/main/java/net/draycia/carbon/common/messages/CarbonMessages.java
@@ -38,6 +38,9 @@ public interface CarbonMessages {
     @Message("channel.radius.empty_recipients")
     void emptyRecipients(final Audience audience);
 
+    @Message("channel.radius.spy")
+    void radiusSpy(Audience audience, Component message);
+
     @Message("channel.not_found")
     void channelNotFound(final Audience audience);