Compare commits
2 Commits
2.0.1-BETA
...
2.0.2-BETA
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
10f06baadc | ||
|
|
07fa138d58 |
2
pom.xml
2
pom.xml
@@ -4,7 +4,7 @@
|
||||
|
||||
<groupId>com.massivecraft</groupId>
|
||||
<artifactId>Factions</artifactId>
|
||||
<version>1.6.9.5-U0.2.1-2.0.1-BETA</version>
|
||||
<version>1.6.9.5-U0.2.1-2.0.2-BETA</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>SaberFactions</name>
|
||||
|
||||
@@ -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 = "<token here>";
|
||||
public static String fromDiscordFactionChatPrefix = "&f[&dDiscord&f] ";
|
||||
public static String avatarUrl = "http://cravatar.eu/helmavatar/%uuid%.png";
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user