Merge remote-tracking branch 'origin/1.6.x' into 1.6.x

2019-12-28 04:58:52 -05:00 · 2019-12-28 04:58:52 -05:00 · e0134d680e
commit e0134d680e
parent 8e855bc9bb 2772d85603
1 changed files with 1 additions and 0 deletions
--- a/src/main/java/com/massivecraft/factions/discord/Discord.java
+++ b/src/main/java/com/massivecraft/factions/discord/Discord.java
@ -61,6 +61,7 @@ public class Discord {
    }

    private static Boolean startBot() {
+        if (!Conf.useDiscordSystem) {return false;}
        try {
            jda = new JDABuilder(AccountType.BOT).setToken(Conf.discordBotToken).buildBlocking();
        } catch (LoginException | InterruptedException e) {