api/src/main/java/com/alttd/chat/config/Config.java

@@ -368,8 +368,6 @@ public final class Config {
     public static String CUSTOM_CHANNEL_TOGGLED = "<yellow>Toggled <channel> <status>.</yellow>";
     public static Component TOGGLED_ON = null;
     public static Component TOGGLED_OFF = null;
-    public static double LOCAL_DISTANCE;
-    public static String CHANNEL_SPY = "<i><gray>SPY:</gray> <dark_gray>(<dark_gray><sender> → <channel>) <message></dark_gray>";
     private static void chatChannels() {
         ConfigurationNode node = getNode("chat-channels");
         if (node.empty()) {
@@ -385,16 +383,12 @@ public final class Config {
             new CustomChannel(channelName,
                     getString(key + "format", ""),
                     getList(key + "servers", Collections.EMPTY_LIST),
-                    getBoolean(key + "proxy", false),
+                    getBoolean(key + "proxy", false));
-                    getBoolean(key + "local", false)
-            );
         }
 
         CUSTOM_CHANNEL_TOGGLED = getString("chat-channels-messages.channel-toggled", CUSTOM_CHANNEL_TOGGLED);
         TOGGLED_ON = Utility.parseMiniMessage(getString("chat-channels-messages.channel-on", "<green>on</green><gray>"));
         TOGGLED_OFF = Utility.parseMiniMessage(getString("chat-channels-messages.channel-off", "<red>off</red><gray>"));
-        LOCAL_DISTANCE = getDouble("chat-channels-messages.local-distance", 200.0);
-        CHANNEL_SPY = getString("chat-channels-messages.spy", CHANNEL_SPY);
     }
 
     public static String SERVERMUTEPERMISSION = "chat.command.mute-server";

api/src/main/java/com/alttd/chat/objects/channels/Channel.java

@@ -10,14 +10,12 @@ public class Channel {
     protected String channelName;
     protected String format;
     protected boolean proxy;
-    protected boolean local;
 
-    public Channel(String channelName, String format, boolean proxy, boolean local) {
+    public Channel(String channelName, String format, boolean proxy) {
         this.permission = "chat.channel." + channelName.toLowerCase();
         this.channelName = channelName;
         this.format = format;
         this.proxy = proxy;
-        this.local = local;
         channels.put(channelName.toLowerCase(), this);
     }
 
@@ -41,10 +39,6 @@ public class Channel {
         return proxy;
     }
 
-    public boolean isLocal() {
-        return local;
-    }
-
     public static Channel getChatChannel(String channelName) {
         return channels.get(channelName.toLowerCase());
     }

api/src/main/java/com/alttd/chat/objects/channels/CustomChannel.java

@@ -5,8 +5,8 @@ import java.util.*;
 public class CustomChannel extends Channel {
     private final List<String> servers;
 
-    public CustomChannel(String channelName, String format, List<String> servers, boolean proxy, boolean local) {
+    public CustomChannel(String channelName, String format, List<String> servers, boolean proxy) {
-        super(channelName, format, proxy, local);
+        super(channelName, format, proxy);
         this.permission = "chat.channel." + channelName.toLowerCase();
         this.channelName = channelName;
         this.format = format;

api/src/main/java/com/alttd/chat/objects/channels/DefaultChannel.java

@@ -2,6 +2,6 @@ package com.alttd.chat.objects.channels;
 
 public abstract class DefaultChannel extends Channel{
     public DefaultChannel(String channelName, String format, boolean proxy) {
-        super(channelName, format, proxy, false);
+        super(channelName, format, proxy);
     }
 }

galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java

@@ -22,9 +22,7 @@ import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import org.bukkit.Bukkit;
-import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
@@ -190,9 +188,9 @@ public class ChatHandler {
         component = modifiableString.component();
 
         if (channel.isProxy()) {
-            sendChatChannelMessage(player, channel.getChannelName(), "chatchannel", component, message);
+            sendChatChannelMessage(player, channel.getChannelName(), "chatchannel", component);
         } else {
-            sendChatChannelMessage(channel, player.getUniqueId(), component, message);
+            sendChatChannelMessage(channel, player.getUniqueId(), component);
         }
     }
 
@@ -245,7 +243,7 @@ public class ChatHandler {
 //        }
     }
 
-    private void sendChatChannelMessage(CustomChannel chatChannel, UUID uuid, Component component, String message) {
+    private void sendChatChannelMessage(CustomChannel chatChannel, UUID uuid, Component component) {
         Player player = Bukkit.getPlayer(uuid);
         if (player == null) {
             ALogger.warn("Failed to send chat message from non existent player");
@@ -263,31 +261,9 @@ public class ChatHandler {
         Stream<? extends Player> stream = Bukkit.getServer().getOnlinePlayers().stream()
                 .filter(p -> p.hasPermission(chatChannel.getPermission()));
         if (!player.hasPermission("chat.ignorebypass")) {
-            stream = stream.filter(receiver -> !ChatUserManager.getChatUser(receiver.getUniqueId()).getIgnoredPlayers().contains(uuid)
+            stream = stream.filter(p -> !ChatUserManager.getChatUser(p.getUniqueId()).getIgnoredPlayers().contains(uuid) && !p.hasPermission("chat.ignorebypass"));
-                    || receiver.hasPermission("chat.ignorebypass"));
         }
-        if (chatChannel.isLocal()) {
+        stream.forEach(p -> p.sendMessage(component));
-            Location location = player.getLocation();
-            stream = stream.filter(receiver -> {
-                Player receiverPlayer = Bukkit.getPlayer(receiver.getUniqueId());
-                if (receiverPlayer == null)
-                    return false;
-                if (!location.getWorld().getUID().equals(receiverPlayer.getLocation().getWorld().getUID()))
-                    return false;
-                return !(receiverPlayer.getLocation().distance(location) > Config.LOCAL_DISTANCE);
-            });
-        }
-        List<? extends Player> recipientPlayers = stream.toList();
-        recipientPlayers.forEach(p -> p.sendMessage(component));
-
-        List<UUID> recipientUUIDs = recipientPlayers.stream().map(Entity::getUniqueId).toList();
-        Bukkit.getServer().getOnlinePlayers().stream()
-                .filter(onlinePlayer -> onlinePlayer.hasPermission(Config.SPYPERMISSION))
-                .filter(onlinePlayer -> !recipientUUIDs.contains(onlinePlayer.getUniqueId()))
-                .forEach(onlinePlayer -> onlinePlayer.sendRichMessage(Config.CHANNEL_SPY,
-                        Placeholder.component("sender", player.name()),
-                        Placeholder.parsed("channel", chatChannel.getChannelName()),
-                        Placeholder.parsed("message", message)));
     }
 
     private void sendPluginMessage(Player player, String channel, Component component) {
@@ -307,7 +283,7 @@ public class ChatHandler {
         player.sendPluginMessage(plugin, Config.MESSAGECHANNEL, out.toByteArray());
     }
 
-    public void sendChatChannelMessage(Player player, String chatChannelName, String channel, Component component, String ignored) {
+    public void sendChatChannelMessage(Player player, String chatChannelName, String channel, Component component) {
         ByteArrayDataOutput out = ByteStreams.newDataOutput();
         out.writeUTF(channel);
         out.writeUTF(chatChannelName);

galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java

@@ -116,7 +116,7 @@ public class ChatListener implements Listener {
 
         if (!player.hasPermission("chat.ignorebypass")) {
             stream = stream.filter(receiver -> !ChatUserManager.getChatUser(receiver.getUniqueId()).getIgnoredPlayers().contains(uuid)
-                    || receiver.hasPermission("chat.ignorebypass"));
+                                               && !receiver.hasPermission("chat.ignorebypass"));
         }
         Set<Player> receivers = stream.collect(Collectors.toSet());
 
@@ -140,9 +140,9 @@ public class ChatListener implements Listener {
             String nickName = PlainTextComponentSerializer.plainText().serialize(onlinePlayer.displayName());
 
             Pattern namePattern = Pattern.compile("\\b(?<!\\\\)" + name + "\\b", Pattern.CASE_INSENSITIVE);
-            //            Pattern escapedNamePattern = Pattern.compile("\\b\\\\" + name + "\\b", Pattern.CASE_INSENSITIVE);
+//            Pattern escapedNamePattern = Pattern.compile("\\b\\\\" + name + "\\b", Pattern.CASE_INSENSITIVE);
             Pattern nickPattern = Pattern.compile("\\b(?<!\\\\)" + nickName + "\\b", Pattern.CASE_INSENSITIVE);
-            //            Pattern escapedNickPattern = Pattern.compile("\\b\\\\" + nickName + "\\b", Pattern.CASE_INSENSITIVE);
+//            Pattern escapedNickPattern = Pattern.compile("\\b\\\\" + nickName + "\\b", Pattern.CASE_INSENSITIVE);
 
             ChatUser onlinePlayerUser = ChatUserManager.getChatUser(onlinePlayer.getUniqueId());
             if (namePattern.matcher(modifiableString.string()).find()) {
@@ -152,18 +152,16 @@ public class ChatListener implements Listener {
                         .replacement(mention.append(onlinePlayerUser.getDisplayName()))
                         .build());
                 //TODO replace all instances of \name with just name but using the match result so the capitalization doesn't change
-                //                modifiableString.replace(TextReplacementConfig.builder()
+//                modifiableString.replace(TextReplacementConfig.builder()
-                //                        .once()
+//                        .once()
-                //                        .match(escapedNamePattern)
+//                        .match(escapedNamePattern)
-                //                        .replacement((a, b) -> {
+//                        .replacement((a, b) -> {
-                //                            String substring = a.group().substring(1);
+//                            String substring = a.group().substring(1);
-                //                            return ;
+//                            return ;
-                //                        });
+//                        });
-
                 if (!ChatUserManager.getChatUser(onlinePlayer.getUniqueId()).getIgnoredPlayers().contains(player.getUniqueId())
-                        || player.hasPermission("chat.ignorebypass")) {
+                    && !player.hasPermission("chat.ignorebypass"))
                     playersToPing.add(onlinePlayer);
-                }
             } else if (nickPattern.matcher(modifiableString.string()).find()) {
                 modifiableString.replace(TextReplacementConfig.builder()
                         .once()
@@ -171,9 +169,8 @@ public class ChatListener implements Listener {
                         .replacement(mention.append(onlinePlayerUser.getDisplayName()))
                         .build());
                 if (!ChatUserManager.getChatUser(onlinePlayer.getUniqueId()).getIgnoredPlayers().contains(player.getUniqueId())
-                        || player.hasPermission("chat.ignorebypass")) {
+                    && !player.hasPermission("chat.ignorebypass"))
                     playersToPing.add(onlinePlayer);
-                }
             }
         }
     }