From ad4bccfc25141376e1375016502243e791bfa343 Mon Sep 17 00:00:00 2001
From: Riku32 <riku@kawaii.sh>
Date: Thu, 8 Jul 2021 03:48:09 -0500
Subject: [PATCH] Fix fatal bugs

---
 pom.xml                                                  | 2 +-
 .../java/com/github/riku32/discordlink/discord/Bot.java  | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 82c0072..2634ddc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.github.riku32</groupId>
     <artifactId>DiscordLink</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
     <packaging>jar</packaging>
 
     <name>DiscordLink</name>
diff --git a/src/main/java/com/github/riku32/discordlink/discord/Bot.java b/src/main/java/com/github/riku32/discordlink/discord/Bot.java
index 751acc5..5c9183d 100644
--- a/src/main/java/com/github/riku32/discordlink/discord/Bot.java
+++ b/src/main/java/com/github/riku32/discordlink/discord/Bot.java
@@ -86,14 +86,15 @@ public Bot(DiscordLink plugin, String token, String guildID, String ownerID, Str
         try {
             commandsBuilder.build(jda, "com.github.riku32.discordlink.discord.commands");
 
-            // Delete botcommands framework listener
-            
-            // TODO: Remove button listener without error
-            // jda.getEventManager().getRegisteredListeners().removeIf(listener -> listener instanceof ButtonListener);
         } catch (IOException exception) {
             plugin.getLogger().severe("Unable to register/update slash commands");
             exception.printStackTrace();
         }
+        
+        // Delete botcommands framework listener
+        for (Object listener : jda.getRegisteredListeners())
+            if (listener instanceof ButtonListener)
+                jda.removeEventListener(listener);
     }
 
     public void shutdown() {