From 250aeb5d16912b0b11c708b408a722dabc968ac5 Mon Sep 17 00:00:00 2001 From: destro174 <40720638+destro174@users.noreply.github.com> Date: Mon, 23 Aug 2021 11:56:31 +0200 Subject: [PATCH] Fix ignore in private message --- .../java/com/alttd/chat/handler/ChatHandler.java | 4 ++-- .../java/com/alttd/chat/listeners/ChatListener.java | 13 +++++++------ .../com/alttd/chat/listeners/PluginMessage.java | 12 ++++++++---- .../java/com/alttd/chat/handlers/ChatHandler.java | 2 ++ 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java b/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java index 0383e74..d96887a 100755 --- a/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java +++ b/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java @@ -42,8 +42,8 @@ public class ChatHandler { } public void privateMessage(Player player, String target, String message) { - ChatUser user = ChatUserManager.getChatUser(player.getUniqueId()); - user.setReplyTarget(target); +// ChatUser user = ChatUserManager.getChatUser(player.getUniqueId()); +// user.setReplyTarget(target); String updatedMessage = RegexManager.replaceText(player.getName(), player.getUniqueId(), message); // todo a better way for this if(updatedMessage == null) { GalaxyUtility.sendBlockedNotification("DM Language", player, message, target); diff --git a/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java b/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java index 8fc415e..0190495 100755 --- a/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java +++ b/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java @@ -40,16 +40,17 @@ public class ChatListener implements Listener, ChatRenderer { + " tried to say: " + PlainComponentSerializer.plain().serialize(event.message()) + ""); - Bukkit.getOnlinePlayers().forEach(a ->{ - if (a.hasPermission("chat.alert-blocked")) { - a.sendMessage(blockedNotification);//TODO make configurable (along with all the messages) - } - }); + Bukkit.broadcast(blockedNotification, "chat.alert-blocked"); +// Bukkit.getOnlinePlayers().forEach(a ->{ +// if (a.hasPermission("chat.alert-blocked")) { +// a.sendMessage(blockedNotification);//TODO make configurable (along with all the messages) +// } +// }); return; } Player player = event.getPlayer(); - ChatUser user = ChatUserManager.getChatUser(player.getUniqueId()); +// ChatUser user = ChatUserManager.getChatUser(player.getUniqueId()); event.viewers().removeIf(audience -> audience instanceof Player receiver && ChatUserManager.getChatUser(receiver.getUniqueId()).getIgnoredPlayers().contains(player.getUniqueId())); 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 4d53460..39f7b9c 100755 --- a/galaxy/src/main/java/com/alttd/chat/listeners/PluginMessage.java +++ b/galaxy/src/main/java/com/alttd/chat/listeners/PluginMessage.java @@ -38,10 +38,12 @@ public class PluginMessage implements PluginMessageListener { UUID uuid = UUID.fromString(in.readUTF()); String target = in.readUTF(); Player p = Bukkit.getPlayer(uuid); + String message = in.readUTF(); + UUID targetuuid = UUID.fromString(in.readUTF()); if (p != null) { ChatUser chatUser = ChatUserManager.getChatUser(uuid); - if (!chatUser.getIgnoredPlayers().contains(uuid)) { - p.sendMessage(GsonComponentSerializer.gson().deserialize(in.readUTF())); + if (!chatUser.getIgnoredPlayers().contains(targetuuid)) { + p.sendMessage(GsonComponentSerializer.gson().deserialize(message)); p.playSound(p.getLocation(), Sound.BLOCK_NOTE_BLOCK_BASS, 1, 1); // todo load this from config ChatUser user = ChatUserManager.getChatUser(uuid); user.setReplyTarget(target); @@ -53,10 +55,12 @@ public class PluginMessage implements PluginMessageListener { UUID uuid = UUID.fromString(in.readUTF()); String target = in.readUTF(); Player p = Bukkit.getPlayer(uuid); + String message = in.readUTF(); + UUID targetuuid = UUID.fromString(in.readUTF()); if (p != null) { ChatUser chatUser = ChatUserManager.getChatUser(uuid); - if (!chatUser.getIgnoredPlayers().contains(uuid)) { - p.sendMessage(GsonComponentSerializer.gson().deserialize(in.readUTF())); + if (!chatUser.getIgnoredPlayers().contains(targetuuid)) { + p.sendMessage(GsonComponentSerializer.gson().deserialize(message)); ChatUser user = ChatUserManager.getChatUser(uuid); user.setReplyTarget(target); } diff --git a/velocity/src/main/java/com/alttd/chat/handlers/ChatHandler.java b/velocity/src/main/java/com/alttd/chat/handlers/ChatHandler.java index b93f985..cd2f750 100755 --- a/velocity/src/main/java/com/alttd/chat/handlers/ChatHandler.java +++ b/velocity/src/main/java/com/alttd/chat/handlers/ChatHandler.java @@ -57,6 +57,7 @@ public class ChatHandler { buf.writeUTF(player.getUniqueId().toString()); buf.writeUTF(player2.getUsername()); buf.writeUTF(GsonComponentSerializer.gson().serialize(component)); + buf.writeUTF(player2.getUniqueId().toString()); serverConnection.sendPluginMessage(VelocityChat.getPlugin().getChannelIdentifier(), buf.toByteArray()); //redirect to the receiver @@ -67,6 +68,7 @@ public class ChatHandler { buf.writeUTF(player2.getUniqueId().toString()); buf.writeUTF(player.getUsername()); buf.writeUTF(GsonComponentSerializer.gson().serialize(component)); + buf.writeUTF(player.getUniqueId().toString()); serverConnection.sendPluginMessage(VelocityChat.getPlugin().getChannelIdentifier(), buf.toByteArray()); }