From aebb37e10eab78301c00380096ee6b3ce218515e Mon Sep 17 00:00:00 2001 From: Lixfel Date: Sat, 2 Oct 2021 07:48:21 +0200 Subject: [PATCH] Fix discord bot shutdown Signed-off-by: Lixfel --- src/de/steamwar/bungeecore/BungeeCore.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/de/steamwar/bungeecore/BungeeCore.java b/src/de/steamwar/bungeecore/BungeeCore.java index be2007a3..13a27a0b 100644 --- a/src/de/steamwar/bungeecore/BungeeCore.java +++ b/src/de/steamwar/bungeecore/BungeeCore.java @@ -31,7 +31,6 @@ import de.steamwar.bungeecore.listeners.mods.WorldDownloader; import de.steamwar.bungeecore.sql.Statement; import de.steamwar.bungeecore.sql.SteamwarUser; import de.steamwar.bungeecore.sql.Team; -import net.dv8tion.jda.api.JDA; import net.md_5.bungee.api.ChatMessageType; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.ProxyServer; @@ -168,10 +167,7 @@ public class BungeeCore extends Plugin { @Override public void onDisable(){ try { - SteamwarDiscordBot.instance().getJda().shutdownNow(); - SteamwarDiscordBot.instance().getJda().awaitStatus(JDA.Status.SHUTDOWN); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); + SteamwarDiscordBot.instance().getJda().shutdown(); } catch (Throwable e) { getLogger().log(Level.SEVERE, "Could not shutdown discord bot", e); }