Always unregister events before interrupting

Skoice · Sep 9, 2024 · c73f60b · c73f60b
1 parent 7ef17ca
commit c73f60b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/main/java/net/clementraynaud/skoice/system/ListenerManager.java b/src/main/java/net/clementraynaud/skoice/system/ListenerManager.java
@@ -91,7 +91,6 @@ public void update(User user) {
         } else if (oldStatus == BotStatus.READY && newStatus != BotStatus.READY) {
             this.unregisterMinecraftListeners();
             if (newStatus != BotStatus.NOT_CONNECTED) {
-                this.unregisterBotListeners();
                 new InterruptSystemTask(this.plugin).run();
             }
         }
@@ -139,7 +138,7 @@ public void registerBotListeners() {
         );
     }
 
-    private void unregisterBotListeners() {
+    public void unregisterBotListeners() {
         this.plugin.getBot().getJDA().removeEventListener(
                 this.guildVoiceGuildMuteListener,
                 this.guildVoiceUpdateListener,

diff --git a/src/main/java/net/clementraynaud/skoice/tasks/InterruptSystemTask.java b/src/main/java/net/clementraynaud/skoice/tasks/InterruptSystemTask.java
@@ -43,10 +43,10 @@ public InterruptSystemTask(Skoice plugin) {
     public void run() {
         ThreadUtil.ensureNotMainThread(true);
 
+        this.plugin.getListenerManager().unregisterBotListeners();
         this.plugin.getUpdateNetworksTask().interrupt();
 
         Guild guild = this.plugin.getBot().getGuild();
-
         if (guild != null
                 && guild.getSelfMember().hasPermission(Permission.ADMINISTRATOR)
                 && (guild.getRequiredMFALevel() != Guild.MFALevel.TWO_FACTOR_AUTH