diff --git a/src/mineverse/Aust1n46/chat/MineverseChat.java b/src/mineverse/Aust1n46/chat/MineverseChat.java index c972975..030200f 100644 --- a/src/mineverse/Aust1n46/chat/MineverseChat.java +++ b/src/mineverse/Aust1n46/chat/MineverseChat.java @@ -949,9 +949,10 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { UUID sender = UUID.fromString(msgin.readUTF()); String sName = msgin.readUTF(); MineverseChatPlayer s = MineverseChatAPI.getMineverseChatPlayer(sender); - String msg = msgin.readUTF(); + String send = msgin.readUTF(); String echo = msgin.readUTF(); String spy = msgin.readUTF(); + String msg = msgin.readUTF(); if(!this.getConfig().getBoolean("bungeecordmessaging", true) || p == null || !p.isOnline()) { out.writeUTF("Message"); out.writeUTF("Offline"); @@ -995,7 +996,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { s = new MineverseChatPlayer(uuid, name, current, ignores, listening, mutes, blockedCommands, false, null, true, true, name, jsonFormat, false, false, false, true, true); MineverseChat.players.add(s); } - p.getPlayer().sendMessage(PlaceholderAPI.setBracketPlaceholders(p.getPlayer(), msg.replaceAll("receiver_", ""))); + p.getPlayer().sendMessage(Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(p.getPlayer(), send.replaceAll("receiver_", ""))) + msg); if(p.hasNotifications()) { if(VersionHandler.is1_8() || VersionHandler.is1_7_10() || VersionHandler.is1_7_2() || VersionHandler.is1_7_9()) { p.getPlayer().playSound(p.getPlayer().getLocation(), Sound.valueOf("LEVEL_UP"), 1, 0); @@ -1011,8 +1012,8 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { out.writeUTF(receiver); out.writeUTF(sender.toString()); out.writeUTF(sName); - out.writeUTF(PlaceholderAPI.setBracketPlaceholders(p.getPlayer(), echo.replaceAll("receiver_", ""))); - out.writeUTF(PlaceholderAPI.setBracketPlaceholders(p.getPlayer(), spy.replaceAll("receiver_", ""))); + out.writeUTF(Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(p.getPlayer(), echo.replaceAll("receiver_", ""))) + msg); + out.writeUTF(Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(p.getPlayer(), spy.replaceAll("receiver_", ""))) + msg); player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray()); return; } diff --git a/src/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java b/src/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java index 15ef092..1efa883 100644 --- a/src/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java +++ b/src/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java @@ -350,9 +350,10 @@ public class MineverseChatBungee extends Plugin implements Listener { String player = in.readUTF(); String sender = in.readUTF(); String sName = in.readUTF(); - String message = in.readUTF(); + String send = in.readUTF(); String echo = in.readUTF(); String spy = in.readUTF(); + String msg = in.readUTF(); SynchronizedMineverseChatPlayer smcp = MineverseChatAPI.getSynchronizedMineverseChatPlayer(UUID.fromString(sender)); smcp.clearMessagePackets(); out.writeUTF("Message"); @@ -361,12 +362,13 @@ public class MineverseChatBungee extends Plugin implements Listener { out.writeUTF(player); out.writeUTF(sender); out.writeUTF(sName); - out.writeUTF(message); + out.writeUTF(send); out.writeUTF(echo); out.writeUTF(spy); - for(String send : getProxy().getServers().keySet()) { - if(getProxy().getServers().get(send).getPlayers().size() > 0) { - getProxy().getServers().get(send).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); + out.writeUTF(msg); + for(String serv : getProxy().getServers().keySet()) { + if(getProxy().getServers().get(serv).getPlayers().size() > 0) { + getProxy().getServers().get(serv).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); } } } diff --git a/src/mineverse/Aust1n46/chat/command/message/MessageCommandExecutor.java b/src/mineverse/Aust1n46/chat/command/message/MessageCommandExecutor.java index 3b2e01b..e8cd823 100644 --- a/src/mineverse/Aust1n46/chat/command/message/MessageCommandExecutor.java +++ b/src/mineverse/Aust1n46/chat/command/message/MessageCommandExecutor.java @@ -198,13 +198,10 @@ public class MessageCommandExecutor implements TabExecutor { if(mcp.getPlayer().hasPermission("venturechat.format")) { msg = Format.FormatString(msg); } - send = Format.FormatStringAll(plugin.getConfig().getString("tellformatfrom")) + msg; - echo = Format.FormatStringAll(plugin.getConfig().getString("tellformatto")) + msg; - spy = Format.FormatStringAll(plugin.getConfig().getString("tellformatspy")) + msg; - send = PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), send.replaceAll("sender_", "")); - echo = PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), echo.replaceAll("sender_", "")); - spy = PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), spy.replaceAll("sender_", "")); + send = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatfrom").replaceAll("sender_", ""))); + echo = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatto").replaceAll("sender_", ""))); + spy = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatspy").replaceAll("sender_", ""))); try { out.writeUTF("Message"); out.writeUTF("Send"); @@ -214,6 +211,7 @@ public class MessageCommandExecutor implements TabExecutor { out.writeUTF(send); out.writeUTF(echo); out.writeUTF(spy); + out.writeUTF(msg); mcp.getPlayer().sendPluginMessage(plugin, MineverseChat.PLUGIN_MESSAGING_CHANNEL, byteOutStream.toByteArray()); out.close(); } diff --git a/src/mineverse/Aust1n46/chat/command/message/Reply.java b/src/mineverse/Aust1n46/chat/command/message/Reply.java index 4b2e0ed..1673dae 100644 --- a/src/mineverse/Aust1n46/chat/command/message/Reply.java +++ b/src/mineverse/Aust1n46/chat/command/message/Reply.java @@ -131,13 +131,22 @@ public class Reply extends MineverseCommand { for(int r = 0; r < args.length; r++) { msg += " " + args[r]; } - send = Format.FormatStringAll(plugin.getConfig().getString("replyformatfrom")) + msg; - echo = Format.FormatStringAll(plugin.getConfig().getString("replyformatto")) + msg; - spy = Format.FormatStringAll(plugin.getConfig().getString("replyformatspy")) + msg; + if(mcp.hasFilter()) { + msg = Format.FilterChat(msg); + } + if(mcp.getPlayer().hasPermission("venturechat.color.legacy")) { + msg = Format.FormatStringLegacyColor(msg); + } + if(mcp.getPlayer().hasPermission("venturechat.color")) { + msg = Format.FormatStringColor(msg); + } + if(mcp.getPlayer().hasPermission("venturechat.format")) { + msg = Format.FormatString(msg); + } - send = PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), send.replaceAll("sender_", "")); - echo = PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), echo.replaceAll("sender_", "")); - spy = PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), spy.replaceAll("sender_", "")); + send = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatfrom").replaceAll("sender_", ""))); + echo = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatto").replaceAll("sender_", ""))); + spy = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatspy").replaceAll("sender_", ""))); try { out.writeUTF("Message"); out.writeUTF("Send"); @@ -147,6 +156,7 @@ public class Reply extends MineverseCommand { out.writeUTF(send); out.writeUTF(echo); out.writeUTF(spy); + out.writeUTF(msg); mcp.getPlayer().sendPluginMessage(plugin, MineverseChat.PLUGIN_MESSAGING_CHANNEL, byteOutStream.toByteArray()); out.close(); }