diff --git a/build-number.txt b/build-number.txt index 4cab17e4..03b0224f 100644 --- a/build-number.txt +++ b/build-number.txt @@ -1 +1 @@ -3456 \ No newline at end of file +3458 \ No newline at end of file diff --git a/src/main/java/me/chayapak1/chomens_bot/Main.java b/src/main/java/me/chayapak1/chomens_bot/Main.java index 141d6bde..1455c557 100644 --- a/src/main/java/me/chayapak1/chomens_bot/Main.java +++ b/src/main/java/me/chayapak1/chomens_bot/Main.java @@ -188,11 +188,6 @@ public class Main { LoggerUtilities.log(stoppingMessage); - EXECUTOR.shutdown(); - EXECUTOR_SERVICE.shutdown(); - FileLoggerUtilities.stop(); - if (database != null) database.stop(); - final ArrayList copiedList; synchronized (bots) { copiedList = new ArrayList<>(bots); @@ -238,6 +233,11 @@ public class Main { if (discord != null && discord.jda != null) discord.jda.shutdown(); } + EXECUTOR.shutdown(); + EXECUTOR_SERVICE.shutdown(); + FileLoggerUtilities.stop(); + if (database != null) database.stop(); + if (callSystemExit) System.exit(exitCode); } } \ No newline at end of file