Fixes #269

Disable waiver amount message for last challenge level.
BentoBoxWorld · Sep 24, 2021 · 644c7d6 · 644c7d6
1 parent aa0336d
commit 644c7d6
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/src/main/java/world/bentobox/challenges/managers/ChallengesManager.java b/src/main/java/world/bentobox/challenges/managers/ChallengesManager.java
@@ -1677,6 +1677,21 @@ public ChallengeLevel getLatestUnlockedLevel(User user, World world)
     }
 
 
+    /**
+     * Returns if the given level is last leve in given world.
+     *
+     * @param level the level
+     * @param world the world
+     * @return the boolean
+     */
+    public boolean isLastLevel(ChallengeLevel level, World world)
+    {
+        List<ChallengeLevel> levels = this.getLevels(world);
+
+        return levels.get(levels.size() - 1) == level;
+    }
+
+
     // ---------------------------------------------------------------------
     // Section: Challenges related methods
     // ---------------------------------------------------------------------

diff --git a/src/main/java/world/bentobox/challenges/panel/CommonPanel.java b/src/main/java/world/bentobox/challenges/panel/CommonPanel.java
@@ -816,8 +816,9 @@ protected List<String> generateLevelDescription(ChallengeLevel level)
         // Get status in single string
         String status = "";
         // Get requirements in single string
-        String waiver = this.user.getTranslationOrNothing(reference + "waiver",
-            "[number]", String.valueOf(level.getWaiverAmount()));
+        String waiver = this.manager.isLastLevel(level, this.world) ? "" :
+            this.user.getTranslationOrNothing(reference + "waiver",
+                "[number]", String.valueOf(level.getWaiverAmount()));
         // Get rewards in single string
         String rewards = this.generateReward(level);
 
@@ -851,9 +852,11 @@ protected List<String> generateLevelDescription(LevelStatus levelStatus, User us
         // Get status in single string
         String status = this.generateLevelStatus(levelStatus);
         // Get requirements in single string
-        String waiver = !levelStatus.isUnlocked() || levelStatus.isComplete() ? "" :
-            this.user.getTranslationOrNothing(reference + "waiver",
-                "[number]", String.valueOf(level.getWaiverAmount()));
+        String waiver = this.manager.isLastLevel(level, this.world) ||
+            !levelStatus.isUnlocked() ||
+            levelStatus.isComplete() ?
+            "" : this.user.getTranslationOrNothing(reference + "waiver",
+            "[number]", String.valueOf(level.getWaiverAmount()));
         // Get rewards in single string
         String rewards = !levelStatus.isUnlocked() ? "" : this.generateReward(level);