Fix message splitting in MessageBuilder#buildAll (#1680)

discord-jda · Jun 23, 2021 · 5a6388a · 5a6388a
1 parent 9750cff
commit 5a6388a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/java/net/dv8tion/jda/api/MessageBuilder.java b/src/main/java/net/dv8tion/jda/api/MessageBuilder.java
@@ -1274,7 +1274,7 @@ public Queue<Message> buildAll(@Nullable SplitPolicy... policy)
 
         LinkedList<Message> messages = new LinkedList<>();
 
-        if (builder.length() <= 2000) {
+        if (builder.length() <= Message.MAX_CONTENT_LENGTH) {
             messages.add(this.build());
             return messages;
         }
@@ -1287,7 +1287,7 @@ public Queue<Message> buildAll(@Nullable SplitPolicy... policy)
         int currentBeginIndex = 0;
 
         messageLoop:
-        while (currentBeginIndex < builder.length() - 2001)
+        while (currentBeginIndex < builder.length() - Message.MAX_CONTENT_LENGTH)
         {
             for (SplitPolicy splitPolicy : policy)
             {
@@ -1302,9 +1302,9 @@ public Queue<Message> buildAll(@Nullable SplitPolicy... policy)
             throw new IllegalStateException("Failed to split the messages");
         }
 
-        if (currentBeginIndex < builder.length() - 1)
+        if (currentBeginIndex < builder.length())
         {
-            messages.add(build(currentBeginIndex, builder.length() - 1));
+            messages.add(build(currentBeginIndex, builder.length()));
         }
 
         if (this.embeds != null)