From e7531fd830dd13078e8cf0cd50277b736f02f69b Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Thu, 3 Nov 2016 22:45:21 +0100
Subject: [PATCH] Made the exception handler more reliable

---
 src/main/java/buttondevteam/discordplugin/DiscordPlugin.java   | 1 +
 .../java/buttondevteam/discordplugin/ExceptionListener.java    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
index 7e1c133..de048e7 100644
--- a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
+++ b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
@@ -106,6 +106,7 @@ public class DiscordPlugin extends JavaPlugin implements IListener<ReadyEvent> {
 			for (int i = msgs.size() - 1; i >= 10; i--) {
 				genchannel.unpin(msgs.get(i));
 			}
+			TBMCCoreAPI.SendUnsentExceptions();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
diff --git a/src/main/java/buttondevteam/discordplugin/ExceptionListener.java b/src/main/java/buttondevteam/discordplugin/ExceptionListener.java
index 48c9e69..85059ba 100644
--- a/src/main/java/buttondevteam/discordplugin/ExceptionListener.java
+++ b/src/main/java/buttondevteam/discordplugin/ExceptionListener.java
@@ -10,9 +10,10 @@ public class ExceptionListener implements Listener {
 	@EventHandler
 	public void onException(TBMCExceptionEvent e) {
 		SendException(e.getException(), e.getSourceMessage());
+		e.setHandled();
 	}
 
-	public static void SendException(Throwable e, String sourcemessage) {
+	private static void SendException(Throwable e, String sourcemessage) {
 		try {
 			StringBuilder sb = new StringBuilder();
 			sb.append(sourcemessage).append("\n");