Merge branch 'master' into Punishment++

src/de/steamwar/bungeecore/BungeeCore.java

@@ -32,7 +32,6 @@ import de.steamwar.bungeecore.sql.Punishment;
 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;
@@ -173,10 +172,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);
         }