From b284bdf1487a710cea38f5fa2a063ce4758b4ec7 Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Thu, 1 Dec 2016 22:25:05 +0100
Subject: [PATCH] Fixes

---
 src/main/java/buttondevteam/discordplugin/DiscordSender.java    | 2 +-
 .../buttondevteam/discordplugin/listeners/CommandListener.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/buttondevteam/discordplugin/DiscordSender.java b/src/main/java/buttondevteam/discordplugin/DiscordSender.java
index d52f985..394294c 100644
--- a/src/main/java/buttondevteam/discordplugin/DiscordSender.java
+++ b/src/main/java/buttondevteam/discordplugin/DiscordSender.java
@@ -103,7 +103,7 @@ public class DiscordSender implements CommandSender {
 	@Override
 	public void sendMessage(String message) {
 		try {
-			final boolean broadcast = new Exception().getStackTrace()[1].getMethodName().contains("broadcast");
+			final boolean broadcast = new Exception().getStackTrace()[2].getMethodName().contains("broadcast");
 			String sanitizedMsg = "";
 			for (int i = 0; i < message.length(); i++) {
 				if (message.charAt(i) != '§') {
diff --git a/src/main/java/buttondevteam/discordplugin/listeners/CommandListener.java b/src/main/java/buttondevteam/discordplugin/listeners/CommandListener.java
index bd7ff06..8e291aa 100644
--- a/src/main/java/buttondevteam/discordplugin/listeners/CommandListener.java
+++ b/src/main/java/buttondevteam/discordplugin/listeners/CommandListener.java
@@ -60,7 +60,7 @@ public class CommandListener {
 		if (message.getContent().startsWith(mention)) // TODO: Resolve mentions: Compound arguments, either a mention or text
 			if (cmdwithargs.length() > mention.length() + 1)
 				cmdwithargs = cmdwithargs.substring(
-						cmdwithargs.charAt(mention.length() + 1) == ' ' ? mention.length() + 1 : mention.length());
+						cmdwithargs.charAt(mention.length()) == ' ' ? mention.length() + 1 : mention.length());
 			else
 				cmdwithargs = "help";
 		if (cmdwithargs.length() == 0)