From ebf862e54acc9e6de07b1311ef70bd37a4756b93 Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Thu, 1 Dec 2016 21:51:12 +0100
Subject: [PATCH] (#12) Added ping and removing color codes

---
 .../buttondevteam/discordplugin/DiscordSender.java | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/buttondevteam/discordplugin/DiscordSender.java b/src/main/java/buttondevteam/discordplugin/DiscordSender.java
index c8f3b8b..d52f985 100644
--- a/src/main/java/buttondevteam/discordplugin/DiscordSender.java
+++ b/src/main/java/buttondevteam/discordplugin/DiscordSender.java
@@ -103,8 +103,18 @@ public class DiscordSender implements CommandSender {
 	@Override
 	public void sendMessage(String message) {
 		try {
-			Bukkit.getScheduler().runTaskAsynchronously(DiscordPlugin.plugin,
-					() -> DiscordPlugin.sendMessageToChannel(channel, message));
+			final boolean broadcast = new Exception().getStackTrace()[1].getMethodName().contains("broadcast");
+			String sanitizedMsg = "";
+			for (int i = 0; i < message.length(); i++) {
+				if (message.charAt(i) != '§') {
+					sanitizedMsg += message.charAt(i);
+				} else {
+					i++;
+				}
+			}
+			final String sendmsg = sanitizedMsg;
+			Bukkit.getScheduler().runTaskAsynchronously(DiscordPlugin.plugin, () -> DiscordPlugin
+					.sendMessageToChannel(channel, (broadcast ? user.mention() + " " : "") + sendmsg));
 		} catch (Exception e) {
 			TBMCCoreAPI.SendException("An error occured while sending message to DiscordSender", e);
 		}