Added CacheClearing fixes and resetting boolean dealing with member c…

…hunk loading.
discord-jda · Oct 14, 2016 · a3647ca · a3647ca
1 parent 5a02146
commit a3647ca
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/main/java/net/dv8tion/jda/core/handle/GuildMembersChunkHandler.java b/src/main/java/net/dv8tion/jda/core/handle/GuildMembersChunkHandler.java
@@ -87,4 +87,10 @@ public void modifyExpectedGuildMember(String guildId, int changeAmount)
         //Ignore. If one of the above things doesn't exist, causing an NPE, then we don't need to worry.
         catch (NullPointerException ignored) {}
     }
+
+    public void clearCache()
+    {
+        expectedGuildMembers.clear();
+        memberChunksCache.clear();
+    }
 }
diff --git a/src/main/java/net/dv8tion/jda/core/handle/ReadyHandler.java b/src/main/java/net/dv8tion/jda/core/handle/ReadyHandler.java
@@ -99,6 +99,7 @@ protected String handleInternally(JSONObject content)
 
     public void guildLoadComplete(JSONObject content)
     {
+        api.getClient().setChunkingAndSyncing(false);
         EntityBuilder builder = EntityBuilder.get(api);
         JSONArray privateChannels = content.getJSONArray("private_channels");
 
@@ -194,7 +195,7 @@ private void checkIfReadyToSendRequests()
     {
         if (acknowledgedGuilds.size() == incompleteGuilds.size())
         {
-            api.getClient().setChunkingAndSyncing();
+            api.getClient().setChunkingAndSyncing(true);
             if (api.getAccountType() == AccountType.CLIENT)
                 sendGuildSyncRequests();
             sendMemberChunkRequests();

diff --git a/src/main/java/net/dv8tion/jda/core/requests/WebSocketClient.java b/src/main/java/net/dv8tion/jda/core/requests/WebSocketClient.java
@@ -436,6 +436,7 @@ protected void sendResume()
     protected void invalidate()
     {
         sessionId = null;
+        chunkingAndSyncing = false;
 
 //        TODO: Reimplement audio handler preservation
 //        //Preserve the audio handlers through registry invalidation
@@ -461,9 +462,10 @@ protected void invalidate()
         api.getFakeUserMap().clear();
         api.getFakePrivateChannelMap().clear();
         EntityBuilder.get(api).clearCache();
-//        new ReadyHandler(api, 0).clearCache();
         EventCache.get(api).clear();
         GuildLock.get(api).clear();
+        this.<ReadyHandler>getHandler("READY").clearCache();
+        this.<GuildMembersChunkHandler>getHandler("GUILD_MEMBERS_CHUNK").clearCache();
     }
 
     protected void restoreAudioHandlers()
@@ -695,11 +697,12 @@ public void handleCallbackError(WebSocket websocket, Throwable cause)
 //        LOG.log(cause);
     }
 
-    public void setChunkingAndSyncing()
+    public void setChunkingAndSyncing(boolean active)
     {
-        chunkingAndSyncing = true;
+        chunkingAndSyncing = active;
     }
 
+
     public HashMap<String, SocketHandler> getHandlers()
     {
         return handlers;