Better calculation for challenge pages

BradBouquio · Jan 29, 2021 · 6fbf93f · 6fbf93f
1 parent c49e841
commit 6fbf93f
Showing 1 changed file with 19 additions and 8 deletions.
diff --git a/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/challenge/ChallengeLogic.java b/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/challenge/ChallengeLogic.java
@@ -470,24 +470,35 @@ public void populateChallengeRank(Inventory menu, PlayerInfo pi, int page, boole
 
     private List<Rank> getRanksForPage(int page, List<Rank> ranksOnPage) {
         int rowsToSkip = (page - 1) * ROWS_OF_RANKS;
-        for (Iterator<Rank> it = ranksOnPage.iterator(); it.hasNext(); ) {
-            Rank rank = it.next();
-            int rowsInRank = getRows(rank);
-            if (rowsToSkip <= 0 || ((rowsToSkip - rowsInRank) < 0)) {
+        List<Rank> allRanks = new ArrayList<>(ranksOnPage);
+
+        int i = 1;
+        for (Iterator<Rank> it = ranksOnPage.iterator(); it.hasNext(); i++) {
+            it.next();
+            int rowsInRanks = calculateRows(allRanks.subList(0,i));
+            if (rowsToSkip <= 0 || ((rowsToSkip - rowsInRanks) < 0)) {
                 return ranksOnPage;
             }
-            rowsToSkip -= rowsInRank;
             it.remove();
         }
         return ranksOnPage;
     }
 
     private int calculateRows(List<Rank> ranksOnPage) {
-        int row = 0;
+        int totalRows = 0;
+        int previousRowsOnPage = 0;
+        int currentRows;
+
         for (Rank rank : ranksOnPage) {
-            row += getRows(rank);
+            currentRows = getRows(rank);
+            totalRows += currentRows;
+
+            if(previousRowsOnPage < 5 && (currentRows + previousRowsOnPage) > 5){
+                totalRows = totalRows + (5 - previousRowsOnPage);
+                previousRowsOnPage = currentRows;
+            } else previousRowsOnPage = previousRowsOnPage + currentRows;
         }
-        return row;
+        return totalRows;
     }
 
     private int getRows(Rank rank) {