From 9e374f29700571464010d474cf02d7f2a8705749 Mon Sep 17 00:00:00 2001 From: ApacheZy Date: Sun, 14 Mar 2021 23:20:51 +0800 Subject: [PATCH] Optionally display the award title. --- .../world/bentobox/challenges/panel/CommonGUI.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/world/bentobox/challenges/panel/CommonGUI.java b/src/main/java/world/bentobox/challenges/panel/CommonGUI.java index e3d69af..dbb5422 100644 --- a/src/main/java/world/bentobox/challenges/panel/CommonGUI.java +++ b/src/main/java/world/bentobox/challenges/panel/CommonGUI.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Map; import java.util.function.Consumer; +import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.World; import org.bukkit.conversations.Conversation; @@ -511,14 +512,12 @@ public abstract class CommonGUI else { // Show a title to the rewards - result.add(this.user.getTranslation("challenges.gui.challenge-description.rewards-title")); - if (isCompletedOnce) + // If there is no reward text, do not display title + String rewardText = isCompletedOnce ? challenge.getRepeatRewardText() : challenge.getRewardText(); + if (rewardText != null && !ChatColor.stripColor(rewardText).isEmpty()) { - result.add(challenge.getRepeatRewardText()); - } - else - { - result.add(challenge.getRewardText()); + result.add(this.user.getTranslation("challenges.gui.challenge-description.rewards-title")); + result.add(rewardText); } } break;