diff --git a/src/main/java/com/massivecraft/factions/Conf.java b/src/main/java/com/massivecraft/factions/Conf.java index 05dc2e1d..39e9710c 100644 --- a/src/main/java/com/massivecraft/factions/Conf.java +++ b/src/main/java/com/massivecraft/factions/Conf.java @@ -98,7 +98,7 @@ public class Conf { public static boolean worldGuardChecking = false; public static boolean worldGuardBuildPriority = false; //DISCORD - public static boolean useDiscordSystem = true; + public static boolean useDiscordSystem = false; public static String discordBotToken = ""; public static String fromDiscordFactionChatPrefix = "&f[&dDiscord&f] "; public static String avatarUrl = "http://cravatar.eu/helmavatar/%uuid%.png"; diff --git a/src/main/java/com/massivecraft/factions/FactionsPlugin.java b/src/main/java/com/massivecraft/factions/FactionsPlugin.java index f749bd88..1eccbee1 100755 --- a/src/main/java/com/massivecraft/factions/FactionsPlugin.java +++ b/src/main/java/com/massivecraft/factions/FactionsPlugin.java @@ -261,6 +261,8 @@ public class FactionsPlugin extends MPlugin { } if(Conf.useDiscordSystem) { new FactionChatHandler(this); + } else { + System.out.println("\n\n\n SABER-FACTIONS-DISCORD-INTEGRATION - You are not using Discord integration features, set conf.json option useDiscordSystem to true and put a valid token in before using!\n\n\n"); } ShopConfig.setup(); diff --git a/src/main/java/com/massivecraft/factions/discord/FactionChatHandler.java b/src/main/java/com/massivecraft/factions/discord/FactionChatHandler.java index 73241006..7f0e3b5d 100644 --- a/src/main/java/com/massivecraft/factions/discord/FactionChatHandler.java +++ b/src/main/java/com/massivecraft/factions/discord/FactionChatHandler.java @@ -40,9 +40,6 @@ public class FactionChatHandler extends ListenerAdapter { private void startBot() { try { jda = new JDABuilder(AccountType.BOT).setToken(Conf.discordBotToken).buildBlocking(); - if(jda == null) { - System.out.println("\n\n\n SABER-FACTIONS-DISCORD-INTEGRATION - Please Make a Valid Token To Use Discord Features! Location Conf.json discordBotToken.\n\n\n"); - } } catch (LoginException | InterruptedException e) { e.printStackTrace(); }