From 668c9634cae341cdc06e0fa6e856d482ff8d59bd Mon Sep 17 00:00:00 2001
From: Josh Roy <10731363+JRoy@users.noreply.github.com>
Date: Thu, 25 Nov 2021 11:54:14 -0500
Subject: [PATCH] Ensure JDA is started before allowing calls to the JDA object

---
 .../main/java/net/essentialsx/discord/JDADiscordService.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java b/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java
index e9b810ec2..5a0dfe87d 100644
--- a/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java
+++ b/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java
@@ -149,9 +149,9 @@ public class JDADiscordService implements DiscordService, IEssentialsModule {
     public void startup() throws LoginException, InterruptedException {
         shutdown();
 
+        invalidStartup = true;
         logger.log(Level.INFO, tl("discordLoggingIn"));
         if (plugin.getSettings().getBotToken().replace("INSERT-TOKEN-HERE", "").trim().isEmpty()) {
-            invalidStartup = true;
             throw new IllegalArgumentException(tl("discordErrorNoToken"));
         }
 
@@ -162,6 +162,7 @@ public class JDADiscordService implements DiscordService, IEssentialsModule {
                 .setContextEnabled(false)
                 .build()
                 .awaitReady();
+        invalidStartup = false;
         updatePresence();
         logger.log(Level.INFO, tl("discordLoggingInDone", jda.getSelfUser().getAsTag()));