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

Create MCP instance on receiving server if it doesn't exist.

Browse Source
This commit is contained in:
Aust1n46 2021-04-11 15:43:09 -05:00
parent 882019b2a0
commit e57ba58e6f
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1262,11 +1262,17 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
if(p.hasNotifications()) { if(p.hasNotifications()) {
Format.playMessageSound(p); Format.playMessageSound(p);
} }
if(MineverseChatAPI.getMineverseChatPlayer(sender) == null) {
MineverseChatPlayer senderMCP = new MineverseChatPlayer(sender, sName);
MineverseChatAPI.addMineverseChatPlayerToMap(senderMCP);
MineverseChatAPI.addNameToMap(senderMCP);
}
p.setReplyPlayer(sender); p.setReplyPlayer(sender);
out.writeUTF("Message"); out.writeUTF("Message");
out.writeUTF("Echo"); out.writeUTF("Echo");
out.writeUTF(server); out.writeUTF(server);
out.writeUTF(receiver); out.writeUTF(receiver);
out.writeUTF(p.getUUID().toString());
out.writeUTF(sender.toString()); out.writeUTF(sender.toString());
out.writeUTF(sName); out.writeUTF(sName);
out.writeUTF(Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(p.getPlayer(), echo.replaceAll("receiver_", ""))) + msg); out.writeUTF(Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(p.getPlayer(), echo.replaceAll("receiver_", ""))) + msg);
@ -1298,13 +1304,16 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
} }
if(identifier.equals("Echo")) { if(identifier.equals("Echo")) {
String receiverName = msgin.readUTF(); String receiverName = msgin.readUTF();
UUID receiverUUID = UUID.fromString(msgin.readUTF());
UUID senderUUID = UUID.fromString(msgin.readUTF()); UUID senderUUID = UUID.fromString(msgin.readUTF());
MineverseChatPlayer senderMCP = MineverseChatAPI.getOnlineMineverseChatPlayer(senderUUID); MineverseChatPlayer senderMCP = MineverseChatAPI.getOnlineMineverseChatPlayer(senderUUID);
MineverseChatPlayer receiverMCP = MineverseChatAPI.getMineverseChatPlayer(receiverName);
String echo = msgin.readUTF(); String echo = msgin.readUTF();
if(receiverMCP != null) { if(MineverseChatAPI.getMineverseChatPlayer(receiverUUID) == null) {
senderMCP.setReplyPlayer(receiverMCP.getUUID()); MineverseChatPlayer receiverMCP = new MineverseChatPlayer(receiverUUID, receiverName);
MineverseChatAPI.addMineverseChatPlayerToMap(receiverMCP);
MineverseChatAPI.addNameToMap(receiverMCP);
} }
senderMCP.setReplyPlayer(receiverUUID);
senderMCP.getPlayer().sendMessage(echo); senderMCP.getPlayer().sendMessage(echo);
} }
if(identifier.equals("Spy")) { if(identifier.equals("Spy")) {

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

@ -521,6 +521,7 @@ 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 receiverUUID = in.readUTF();
String sender = in.readUTF(); String sender = in.readUTF();
String sName = in.readUTF(); String sName = in.readUTF();
String echo = in.readUTF(); String echo = in.readUTF();
@ -528,6 +529,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
out.writeUTF("Message"); out.writeUTF("Message");
out.writeUTF("Echo"); out.writeUTF("Echo");
out.writeUTF(player); out.writeUTF(player);
out.writeUTF(receiverUUID);
out.writeUTF(sender); out.writeUTF(sender);
out.writeUTF(echo); out.writeUTF(echo);
if(getProxy().getServers().get(server).getPlayers().size() > 0) { if(getProxy().getServers().get(server).getPlayers().size() > 0) {