From 7f73d4fb23aa5d7fe90607b8b6192439d01b328c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beatrice=20Dellac=C3=A0?= Date: Mon, 16 Jan 2023 02:11:16 +0100 Subject: [PATCH] Fix shutdown method no longer shutting down when invocated directly --- src/main/java/wtf/beatrice/hidekobot/HidekoBot.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/wtf/beatrice/hidekobot/HidekoBot.java b/src/main/java/wtf/beatrice/hidekobot/HidekoBot.java index 5118cba..66ab456 100644 --- a/src/main/java/wtf/beatrice/hidekobot/HidekoBot.java +++ b/src/main/java/wtf/beatrice/hidekobot/HidekoBot.java @@ -224,7 +224,7 @@ public class HidekoBot } // register shutdown interrupt signal listener for proper shutdown. - Runtime.getRuntime().addShutdownHook(new Thread(HidekoBot::shutdown)); + Runtime.getRuntime().addShutdownHook(new Thread(HidekoBot::preShutdown)); // set startup time. Cache.setStartupTime(LocalDateTime.now()); @@ -244,8 +244,15 @@ public class HidekoBot } public static void shutdown() + { + preShutdown(); + System.exit(0); + } + + private static void preShutdown() { LOGGER.warn("WARNING! Shutting down!"); if(jda != null) jda.shutdown(); } + }