diff --git a/api/src/main/java/com/alttd/chat/config/Config.java b/api/src/main/java/com/alttd/chat/config/Config.java index 66d9a08..2723fcb 100755 --- a/api/src/main/java/com/alttd/chat/config/Config.java +++ b/api/src/main/java/com/alttd/chat/config/Config.java @@ -203,7 +203,7 @@ public final class Config { } // TODO prefixes need hovers, this hasn't been setup yet! - public static String CHATFORMAT = " : "; + public static String CHATFORMAT = " > >: "; private static void Chat() { CHATFORMAT = getString("chat.format", CHATFORMAT); } diff --git a/api/src/main/java/com/alttd/chat/util/Utility.java b/api/src/main/java/com/alttd/chat/util/Utility.java index 1860256..07ae6c0 100755 --- a/api/src/main/java/com/alttd/chat/util/Utility.java +++ b/api/src/main/java/com/alttd/chat/util/Utility.java @@ -18,8 +18,8 @@ public class Utility { public static HashMap colors; static { // this might be in minimessage already? colors = new HashMap<>(); - colors.put("&0", ""); // and confirm these are correct - colors.put("&1", ""); // could also add some default hex colors here? + colors.put("&0", ""); + colors.put("&1", ""); colors.put("&2", ""); colors.put("&3", ""); colors.put("&4", ""); 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 128c804..033d4eb 100755 --- a/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java +++ b/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java @@ -26,6 +26,7 @@ import org.bukkit.util.StringUtil; import java.util.ArrayList; import java.util.List; +import java.util.UUID; import java.util.concurrent.TimeUnit; public class ChatHandler { @@ -158,15 +159,16 @@ public class ChatHandler { if (channel.isProxy()) { sendChatChannelMessage(player, channel.getChannelName(), "chatchannel", component); } 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; Bukkit.getServer().getOnlinePlayers().stream() .filter(p -> p.hasPermission(chatChannel.getPermission())) + .filter(p -> !ChatUserManager.getChatUser(p.getUniqueId()).getIgnoredPlayers().contains(uuid)) .forEach(p -> p.sendMessage(component)); } @@ -191,6 +193,7 @@ public class ChatHandler { ByteArrayDataOutput out = ByteStreams.newDataOutput(); out.writeUTF(channel); out.writeUTF(chatChannelName); + out.writeUTF(player.getUniqueId().toString()); out.writeUTF(GsonComponentSerializer.gson().serialize(component)); player.sendPluginMessage(plugin, Config.MESSAGECHANNEL, out.toByteArray()); } 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 5cd5c6c..9046ea8 100755 --- a/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java +++ b/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java @@ -93,6 +93,7 @@ public class ChatListener implements Listener, ChatRenderer { List