Altitude/Chat
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make ignore work in ChatChannel

Browse Source
This commit is contained in:
Teriuihi 2021-08-08 07:11:00 +02:00
parent 76c24828dd
commit 351515ab55
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java
View File

@ -26,6 +26,7 @@ import org.bukkit.util.StringUtil;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.UUID;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
public class ChatHandler { public class ChatHandler {
@ -158,15 +159,16 @@ public class ChatHandler {
if (channel.isProxy()) { if (channel.isProxy()) {
sendChatChannelMessage(player, channel.getChannelName(), "chatchannel", component); sendChatChannelMessage(player, channel.getChannelName(), "chatchannel", component);
} else { } else {
sendChatChannelMessage(channel, component); sendChatChannelMessage(channel, player.getUniqueId(), component);
} }
} }
private void sendChatChannelMessage(Channel chatChannel, Component component) { private void sendChatChannelMessage(Channel chatChannel, UUID uuid, Component component) {
if (!chatChannel.getServers().contains(Bukkit.getServerName())) return; if (!chatChannel.getServers().contains(Bukkit.getServerName())) return;
Bukkit.getServer().getOnlinePlayers().stream() Bukkit.getServer().getOnlinePlayers().stream()
.filter(p -> p.hasPermission(chatChannel.getPermission())) .filter(p -> p.hasPermission(chatChannel.getPermission()))
.filter(p -> !ChatUserManager.getChatUser(p.getUniqueId()).getIgnoredPlayers().contains(uuid))
.forEach(p -> p.sendMessage(component)); .forEach(p -> p.sendMessage(component));
} }
@ -191,6 +193,7 @@ public class ChatHandler {
ByteArrayDataOutput out = ByteStreams.newDataOutput(); ByteArrayDataOutput out = ByteStreams.newDataOutput();
out.writeUTF(channel); out.writeUTF(channel);
out.writeUTF(chatChannelName); out.writeUTF(chatChannelName);
out.writeUTF(player.getUniqueId().toString());
out.writeUTF(GsonComponentSerializer.gson().serialize(component)); out.writeUTF(GsonComponentSerializer.gson().serialize(component));
player.sendPluginMessage(plugin, Config.MESSAGECHANNEL, out.toByteArray()); player.sendPluginMessage(plugin, Config.MESSAGECHANNEL, out.toByteArray());
} }

4
galaxy/src/main/java/com/alttd/chat/listeners/PluginMessage.java
View File

@ -80,9 +80,11 @@ public class PluginMessage implements PluginMessageListener {
private void chatChannel(ByteArrayDataInput in) { private void chatChannel(ByteArrayDataInput in) {
Channel chatChannel = null; Channel chatChannel = null;
UUID uuid = null;
Component component = null; Component component = null;
try { try {
chatChannel = Channel.getChatChannel(in.readUTF()); chatChannel = Channel.getChatChannel(in.readUTF());
uuid = UUID.fromString(in.readUTF());
component = GsonComponentSerializer.gson().deserialize(in.readUTF()); component = GsonComponentSerializer.gson().deserialize(in.readUTF());
} catch (Exception e) { //Idk the exception for reading too far into in.readUTF() } catch (Exception e) { //Idk the exception for reading too far into in.readUTF()
e.printStackTrace(); e.printStackTrace();
@ -102,12 +104,14 @@ public class PluginMessage implements PluginMessageListener {
final Channel finalChatChannel = chatChannel; final Channel finalChatChannel = chatChannel;
final Component finalComponent = component; final Component finalComponent = component;
final UUID finalUuid = uuid;
new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
Bukkit.getOnlinePlayers().stream() Bukkit.getOnlinePlayers().stream()
.filter(p -> p.hasPermission(finalChatChannel.getPermission())) .filter(p -> p.hasPermission(finalChatChannel.getPermission()))
.filter(p -> !ChatUserManager.getChatUser(p.getUniqueId()).getIgnoredPlayers().contains(finalUuid))
.forEach(p -> p.sendMessage(finalComponent)); .forEach(p -> p.sendMessage(finalComponent));
} }
}.runTaskAsynchronously(ChatPlugin.getInstance()); }.runTaskAsynchronously(ChatPlugin.getInstance());