Upstream
/
Quests
mirror of https://github.com/PikaMug/Quests.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clear extra space from custom objective display

This commit is contained in:
PikaMug 2024-01-12 05:17:07 -05:00
parent 3e59fc5659
commit 3f2465fe6c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/me/pikamug/quests/item/BukkitQuestJournal.java
View File

@ -78,7 +78,7 @@ public class BukkitQuestJournal {
continue; continue;
} }
final String message = "- " + BukkitLang.BukkitFormatToken.convertString(player, final String message = "- " + BukkitLang.BukkitFormatToken.convertString(player,
objective.getMessage()); objective.getMessage().trim().replaceAll("\\s{2,}", ""));
if (!plugin.getConfigSettings().canShowCompletedObjs() if (!plugin.getConfigSettings().canShowCompletedObjs()
&& message.startsWith(ChatColor.GRAY.toString())) { && message.startsWith(ChatColor.GRAY.toString())) {
continue; continue;

8
core/src/main/java/me/pikamug/quests/player/BukkitQuester.java
View File

@ -1668,7 +1668,7 @@ public class BukkitQuester implements Quester {
if (co.canShowCount()) { if (co.canShowCount()) {
message = message.replace("%count%", cleared + "/" + toClear); message = message.replace("%count%", cleared + "/" + toClear);
} }
message = BukkitConfigUtil.parseString(message); message = BukkitConfigUtil.parseString(message.trim().replaceAll("\\s{2,}", ""));
objectives.add(new BukkitObjective(ObjectiveType.CUSTOM, message, cleared, toClear)); objectives.add(new BukkitObjective(ObjectiveType.CUSTOM, message, cleared, toClear));
customIndex++; customIndex++;
} }
@ -1760,7 +1760,11 @@ public class BukkitQuester implements Quester {
if (!settings.canShowCompletedObjs() && objective.getProgress() >= objective.getGoal()) { if (!settings.canShowCompletedObjs() && objective.getProgress() >= objective.getGoal()) {
continue; continue;
} }
quester.sendMessage(message); if (obj.getType().equals(ObjectiveType.CUSTOM)) {
quester.sendMessage(message.trim().replaceAll("\\s{2,}", ""));
} else {
quester.sendMessage(message);
}
} }
} }
} }