diff --git a/velocity/src/main/java/com/alttd/chat/data/ServerWrapper.java b/velocity/src/main/java/com/alttd/chat/data/ServerWrapper.java index 0e70c1b..e529dd6 100755 --- a/velocity/src/main/java/com/alttd/chat/data/ServerWrapper.java +++ b/velocity/src/main/java/com/alttd/chat/data/ServerWrapper.java @@ -1,9 +1,12 @@ package com.alttd.chat.data; import com.alttd.chat.config.ServerConfig; +import com.alttd.chat.managers.ChatUserManager; import com.velocitypowered.api.proxy.server.RegisteredServer; import net.kyori.adventure.text.Component; +import java.util.UUID; + public class ServerWrapper { private final RegisteredServer registeredServer; @@ -37,8 +40,10 @@ public class ServerWrapper { return joinMessages; } - public void sendJoinLeaveMessage(Component component) { + public void sendJoinLeaveMessage(UUID uuid, Component component) { if(joinMessages()) - getRegisteredServer().sendMessage(component); + getRegisteredServer().getPlayersConnected().stream() + .filter(p -> ChatUserManager.getChatUser(p.getUniqueId()).getIgnoredPlayers().contains(uuid)) + .forEach(p -> p.sendMessage(component)); } } diff --git a/velocity/src/main/java/com/alttd/chat/listeners/ProxyPlayerListener.java b/velocity/src/main/java/com/alttd/chat/listeners/ProxyPlayerListener.java index af22692..437d343 100755 --- a/velocity/src/main/java/com/alttd/chat/listeners/ProxyPlayerListener.java +++ b/velocity/src/main/java/com/alttd/chat/listeners/ProxyPlayerListener.java @@ -48,11 +48,11 @@ public class ProxyPlayerListener { // todo Code clean up @Destro ServerWrapper wrapper = serverHandler.getWrapper(previousServer.getServerInfo().getName()); if(wrapper != null) { - wrapper.sendJoinLeaveMessage(miniMessage.parse(Config.SERVERSWTICHMESSAGETO, templates)); + wrapper.sendJoinLeaveMessage(event.getPlayer().getUniqueId(), miniMessage.parse(Config.SERVERSWTICHMESSAGETO, templates)); } wrapper = serverHandler.getWrapper(event.getServer().getServerInfo().getName()); if(wrapper != null) { - wrapper.sendJoinLeaveMessage(miniMessage.parse(Config.SERVERSWTICHMESSAGEFROM, templates)); + wrapper.sendJoinLeaveMessage(event.getPlayer().getUniqueId(), miniMessage.parse(Config.SERVERSWTICHMESSAGEFROM, templates)); } } else { List