Added spy override to Bungee messaging.

This commit is contained in:
Aust1n46 2021-04-10 14:25:48 -05:00
parent 704b724b9e
commit 9f49a41bbc
2 changed files with 14 additions and 11 deletions

View File

@ -1310,9 +1310,11 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
String receiverName = msgin.readUTF(); String receiverName = msgin.readUTF();
String senderName = msgin.readUTF(); String senderName = msgin.readUTF();
String spy = msgin.readUTF(); String spy = msgin.readUTF();
for(MineverseChatPlayer pl : MineverseChatAPI.getOnlineMineverseChatPlayers()) { if(!spy.startsWith("VentureChat:NoSpy")) {
if(pl.isSpy() && !pl.getName().equals(senderName) && !pl.getName().equals(receiverName)) { for(MineverseChatPlayer pl : MineverseChatAPI.getOnlineMineverseChatPlayers()) {
pl.getPlayer().sendMessage(spy); if(pl.isSpy() && !pl.getName().equals(senderName) && !pl.getName().equals(receiverName)) {
pl.getPlayer().sendMessage(spy);
}
} }
} }
} }

View File

@ -181,13 +181,11 @@ public class MessageCommandExecutor implements TabExecutor {
} }
ByteArrayOutputStream byteOutStream = new ByteArrayOutputStream(); ByteArrayOutputStream byteOutStream = new ByteArrayOutputStream();
DataOutputStream out = new DataOutputStream(byteOutStream); DataOutputStream out = new DataOutputStream(byteOutStream);
String msg = ""; StringBuilder msgBuilder = new StringBuilder();
String send = "";
String echo = "";
String spy = "";
for(int r = 1; r < args.length; r++) { for(int r = 1; r < args.length; r++) {
msg += " " + args[r]; msgBuilder.append(" " + args[r]);
} }
String msg = msgBuilder.toString();
if(mcp.hasFilter()) { if(mcp.hasFilter()) {
msg = Format.FilterChat(msg); msg = Format.FilterChat(msg);
} }
@ -201,9 +199,12 @@ public class MessageCommandExecutor implements TabExecutor {
msg = Format.FormatString(msg); msg = Format.FormatString(msg);
} }
send = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatfrom").replaceAll("sender_", ""))); String 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_", ""))); String 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_", ""))); String spy = "VentureChat:NoSpy";
if(!mcp.getPlayer().hasPermission("venturechat.spy.override")) {
spy = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatspy").replaceAll("sender_", "")));
}
try { try {
out.writeUTF("Message"); out.writeUTF("Message");
out.writeUTF("Send"); out.writeUTF("Send");