Fixed problem where all AccountTypes were using ClientRateLimiter. (Y…

…es, even bots)
discord-jda · Nov 9, 2016 · 7726cdf · 7726cdf
1 parent a237fbc
commit 7726cdf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/main/java/net/dv8tion/jda/core/entities/impl/JDAImpl.java b/src/main/java/net/dv8tion/jda/core/entities/impl/JDAImpl.java
@@ -64,7 +64,7 @@ public class JDAImpl implements JDA
 
     protected HttpHost proxy;
     protected WebSocketClient client;
-    protected Requester requester = new Requester(this);
+    protected Requester requester;
     protected IEventManager eventManager = new InterfacedEventManager();
     protected Status status = Status.INITIALIZING;
     protected SelfUser selfUser;
@@ -80,6 +80,7 @@ public JDAImpl(AccountType accountType, HttpHost proxy, boolean autoReconnect, b
     {
         this.presence = new PresenceImpl(this);
         this.accountType = accountType;
+        this.requester = new Requester(this);
         this.proxy = proxy;
         this.autoReconnect = autoReconnect;
         this.audioEnabled = audioEnabled;

diff --git a/src/main/java/net/dv8tion/jda/core/requests/Requester.java b/src/main/java/net/dv8tion/jda/core/requests/Requester.java
@@ -52,6 +52,9 @@ public Requester(JDA api)
 
     public Requester(JDA api, AccountType accountType)
     {
+        if (accountType == null)
+            throw new NullPointerException("Provided accountType was null!");
+
         this.api = api;
         if (accountType == AccountType.BOT)
             rateLimiter = new BotRateLimiter(this, 5);