mirror/VentureChat
1
0
Fork 1
mirror of https://github.com/Aust1n46/VentureChat.git synced 2025-05-23 10:39:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed minor bug with spy showing messages you received.

Browse Source 
Fixed inconsistencies with /ignore command.
This commit is contained in:
Aust1n46 2021-02-09 12:06:41 -06:00
parent 6ef38eac55
commit 9f676024d8
5 changed files with 20 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bungee.yml
View File

@ -1,4 +1,4 @@
name: VentureChat name: VentureChat
main: mineverse.Aust1n46.chat.bungee.MineverseChatBungee main: mineverse.Aust1n46.chat.bungee.MineverseChatBungee
version: 2.21.0 version: 2.21.1
author: Aust1n46 author: Aust1n46

15
src/mineverse/Aust1n46/chat/MineverseChat.java
View File

@ -906,6 +906,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
out.writeUTF("Echo"); out.writeUTF("Echo");
out.writeUTF(server); out.writeUTF(server);
out.writeUTF(p.getUUID().toString()); out.writeUTF(p.getUUID().toString());
out.writeUTF(receiver);
out.writeUTF(sender.toString()); out.writeUTF(sender.toString());
player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray()); player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray());
return; return;
@ -919,16 +920,13 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
} }
if(identifier.equals("Echo")) { if(identifier.equals("Echo")) {
UUID receiver = UUID.fromString(msgin.readUTF()); UUID receiver = UUID.fromString(msgin.readUTF());
String receiverName = msgin.readUTF();
UUID sender = UUID.fromString(msgin.readUTF()); UUID sender = UUID.fromString(msgin.readUTF());
MineverseChatPlayer p = MineverseChatAPI.getOnlineMineverseChatPlayer(sender); MineverseChatPlayer p = MineverseChatAPI.getOnlineMineverseChatPlayer(sender);
MineverseChatPlayer r = MineverseChatAPI.getMineverseChatPlayer(receiver);
String rName = receiver.toString();
if(r != null) {
rName = Format.FormatStringAll(r.getNickname());
}
if(p.getIgnores().contains(receiver)) { if(p.getIgnores().contains(receiver)) {
p.getPlayer().sendMessage(ChatColor.GOLD + "You are no longer ignoring player: " + ChatColor.RED + rName); p.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_OFF.toString()
.replace("{player}", receiverName));
p.removeIgnore(receiver); p.removeIgnore(receiver);
this.synchronize(p, true); this.synchronize(p, true);
return; return;
@ -936,7 +934,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
p.addIgnore(receiver); p.addIgnore(receiver);
p.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_ON.toString() p.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_ON.toString()
.replace("{player}", rName)); .replace("{player}", receiverName));
this.synchronize(p, true); this.synchronize(p, true);
} }
} }
@ -980,9 +978,6 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray()); player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray());
return; return;
} }
if(s != null) {
sName = Format.FormatStringAll(s.getNickname());
}
else { else {
UUID uuid = sender; UUID uuid = sender;
String name = sName; String name = sName;

2
src/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java
View File

@ -333,10 +333,12 @@ public class MineverseChatBungee extends Plugin implements Listener {
if(identifier.equals("Echo")) { if(identifier.equals("Echo")) {
String server = in.readUTF(); String server = in.readUTF();
String player = in.readUTF(); String player = in.readUTF();
String receiverName = in.readUTF();
String sender = in.readUTF(); String sender = in.readUTF();
out.writeUTF("Ignore"); out.writeUTF("Ignore");
out.writeUTF("Echo"); out.writeUTF("Echo");
out.writeUTF(player); out.writeUTF(player);
out.writeUTF(receiverName);
out.writeUTF(sender); out.writeUTF(sender);
if(getProxy().getServers().get(server).getPlayers().size() > 0) { if(getProxy().getServers().get(server).getPlayers().size() > 0) {
getProxy().getServers().get(server).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray()); getProxy().getServers().get(server).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray());

25
src/mineverse/Aust1n46/chat/command/message/Ignore.java
View File

@ -49,21 +49,7 @@ public class Ignore extends MineverseCommand {
} }
return; return;
} }
MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); if(mcp.getName().equalsIgnoreCase(args[0])) {
if(player == null) {
mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
.replace("{args}", args[0]));
return;
}
if(mcp.getIgnores().contains(player.getUUID())) {
mcp.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_OFF.toString()
.replace("{player}", player.getName()));
mcp.removeIgnore(player.getUUID());
plugin.synchronize(mcp, true);
return;
}
if(mcp.getName().equalsIgnoreCase(player.getName())) {
mcp.getPlayer().sendMessage(LocalizedMessage.IGNORE_YOURSELF.toString()); mcp.getPlayer().sendMessage(LocalizedMessage.IGNORE_YOURSELF.toString());
return; return;
} }
@ -83,13 +69,16 @@ public class Ignore extends MineverseCommand {
} }
return; return;
} }
if(!player.isOnline()) {
MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]);
if(player == null || !player.isOnline()) {
mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
.replace("{args}", player.getName())); .replace("{args}", args[0]));
return; return;
} }
if(mcp.getIgnores().contains(player.getUUID())) { if(mcp.getIgnores().contains(player.getUUID())) {
mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are no longer ignoring player: " + ChatColor.RED + player.getName()); mcp.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_OFF.toString()
.replace("{player}", player.getName()));
mcp.removeIgnore(player.getUUID()); mcp.removeIgnore(player.getUUID());
plugin.synchronize(mcp, true); plugin.synchronize(mcp, true);
return; return;

2
src/plugin.yml
View File

@ -1,5 +1,5 @@
name: VentureChat name: VentureChat
version: 2.21.0 version: 2.21.1
api-version: 1.13 api-version: 1.13
main: mineverse.Aust1n46.chat.MineverseChat main: mineverse.Aust1n46.chat.MineverseChat
depend: [Vault, ProtocolLib, PlaceholderAPI] depend: [Vault, ProtocolLib, PlaceholderAPI]