implement onDisable and actually disable things in it even

DenizenScript · Feb 8, 2021 · f504c72 · f504c72
1 parent 0cde1e5
commit f504c72
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <BUILD_NUMBER>Unknown</BUILD_NUMBER>
-        <bukkit.version>1.16.4-R0.1-SNAPSHOT</bukkit.version>
+        <bukkit.version>1.16.5-R0.1-SNAPSHOT</bukkit.version>
 		<denizen.version>1.1.9-SNAPSHOT</denizen.version>
     </properties>
 
@@ -87,7 +87,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.2.4</version>
                 <executions>
                     <execution>
                         <phase>package</phase>

diff --git a/src/main/java/com/denizenscript/ddiscordbot/DenizenDiscordBot.java b/src/main/java/com/denizenscript/ddiscordbot/DenizenDiscordBot.java
@@ -12,6 +12,8 @@
 import com.denizenscript.denizencore.tags.TagManager;
 import com.denizenscript.denizencore.utilities.debugging.FutureWarning;
 import com.denizenscript.denizencore.utilities.debugging.Warning;
+import org.bukkit.Bukkit;
+import org.bukkit.event.HandlerList;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.util.HashMap;
@@ -173,4 +175,21 @@ public void onEnable() {
             Debug.echoError(ex);
         }
     }
+
+    @Override
+    public void onDisable() {
+        for (DiscordConnection connection : connections.values()) {
+            try {
+                if (connection.client != null) {
+                    connection.client.shutdownNow();
+                }
+            }
+            catch (Throwable ex) {
+                Debug.echoError(ex);
+            }
+        }
+        connections.clear();
+        Bukkit.getServer().getScheduler().cancelTasks(this);
+        HandlerList.unregisterAll(this);
+    }
 }