diff --git a/galaxy/src/main/java/com/alttd/chat/listeners/PluginMessage.java b/galaxy/src/main/java/com/alttd/chat/listeners/PluginMessage.java index de4ccb3..be16619 100755 --- a/galaxy/src/main/java/com/alttd/chat/listeners/PluginMessage.java +++ b/galaxy/src/main/java/com/alttd/chat/listeners/PluginMessage.java @@ -39,18 +39,12 @@ public class PluginMessage implements PluginMessageListener { } case "globalchat": { if (ChatPlugin.getInstance().serverGlobalChatEnabled() && !ChatPlugin.getInstance().serverMuted()) { - String uuidString = in.readUTF(); - if (!uuidString.matches("\\b[0-9a-f]{8}\\b-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-\\b[0-9a-f]{12}\\b")) { - Bukkit.broadcast(GsonComponentSerializer.gson().deserialize(uuidString), Config.GCPERMISSION); - break; - } - - UUID uuid = UUID.fromString(uuidString); + UUID uuid = UUID.fromString(in.readUTF()); String message = in.readUTF(); Bukkit.getOnlinePlayers().stream().filter(p -> p.hasPermission(Config.GCPERMISSION)).forEach(p -> { ChatUser chatUser = ChatUserManager.getChatUser(p.getUniqueId()); - if (chatUser.getIgnoredPlayers().contains(uuid)) { + if (!chatUser.getIgnoredPlayers().contains(uuid)) { p.sendMessage(GsonComponentSerializer.gson().deserialize(message)); } }); diff --git a/velocity/src/main/java/com/alttd/chat/listeners/PluginMessageListener.java b/velocity/src/main/java/com/alttd/chat/listeners/PluginMessageListener.java index c377d10..e98cf20 100755 --- a/velocity/src/main/java/com/alttd/chat/listeners/PluginMessageListener.java +++ b/velocity/src/main/java/com/alttd/chat/listeners/PluginMessageListener.java @@ -9,6 +9,8 @@ import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ServerConnection; import com.velocitypowered.api.proxy.messages.ChannelIdentifier; +import java.util.UUID; + public class PluginMessageListener { //todo add an extra listener for nicknames?