Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-22 17:18:37 +01:00
Code Issues Projects Releases Wiki Activity

Ensure JDA is started before allowing calls to the JDA object

Browse Source
This commit is contained in:
Josh Roy 2021-11-25 11:54:14 -05:00
parent 51c49b0de6
commit 668c9634ca
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java
View File

@ -149,9 +149,9 @@ public class JDADiscordService implements DiscordService, IEssentialsModule {
public void startup() throws LoginException, InterruptedException { public void startup() throws LoginException, InterruptedException {
shutdown(); shutdown();
invalidStartup = true;
logger.log(Level.INFO, tl("discordLoggingIn")); logger.log(Level.INFO, tl("discordLoggingIn"));
if (plugin.getSettings().getBotToken().replace("INSERT-TOKEN-HERE", "").trim().isEmpty()) { if (plugin.getSettings().getBotToken().replace("INSERT-TOKEN-HERE", "").trim().isEmpty()) {
invalidStartup = true;
throw new IllegalArgumentException(tl("discordErrorNoToken")); throw new IllegalArgumentException(tl("discordErrorNoToken"));
} }
@ -162,6 +162,7 @@ public class JDADiscordService implements DiscordService, IEssentialsModule {
.setContextEnabled(false) .setContextEnabled(false)
.build() .build()
.awaitReady(); .awaitReady();
invalidStartup = false;
updatePresence(); updatePresence();
logger.log(Level.INFO, tl("discordLoggingInDone", jda.getSelfUser().getAsTag())); logger.log(Level.INFO, tl("discordLoggingInDone", jda.getSelfUser().getAsTag()));