From 6bf60b6c6dfb3fa97b93eea5c1e71d114472ebbd Mon Sep 17 00:00:00 2001
From: Aust1n46 <aust1n46@yahoo.com>
Date: Wed, 8 Apr 2020 14:46:31 -0400
Subject: [PATCH] Add JSON message remover to Bungee messages from DiscordSRV

---
 .../Aust1n46/chat/MineverseChat.java          | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java
index a5494fb..104c067 100644
--- a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java
+++ b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java
@@ -760,13 +760,24 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
 				}
 			}
 			if(subchannel.equals("DiscordSRV")) {
-				String chatchannel = msgin.readUTF();
+				String chatChannel = msgin.readUTF();
 				String message = msgin.readUTF();
-				if(ChatChannel.isChannel(chatchannel) && ChatChannel.getChannel(chatchannel).getBungee()) {
-					for(MineverseChatPlayer p : MineverseChat.onlinePlayers) {
-						p.getPlayer().sendMessage(Format.FormatStringAll(message));
-					}
+				if(!ChatChannel.isChannel(chatChannel)) {
+					return;
 				}
+				ChatChannel chatChannelObj = ChatChannel.getChannel(chatChannel);
+				if(!chatChannelObj.getBungee()) {
+					return;
+				}	
+				
+				String json = Format.convertPlainTextToJson(message, true);
+				int hash = (message.replaceAll("([§]([a-z0-9]))", "")).hashCode();
+				
+				for(MineverseChatPlayer p : MineverseChat.onlinePlayers) {
+					String finalJSON = Format.formatModerationGUI(json, p.getPlayer(), "Discord", chatChannelObj.getName(), hash);
+					PacketContainer packet = Format.createPacketPlayOutChat(finalJSON);
+					Format.sendPacketPlayOutChat(p.getPlayer(), packet);
+				}	
 			}
 			if(subchannel.equals("Chwho")) {
 				String identifier = msgin.readUTF();