Skip to content

GH-355 Add additional placeholder for combatNotification #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
CitralFlo wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −1
Draft

GH-355 Add additional placeholder for combatNotification #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...t-plugin/src/main/java/com/eternalcode/combat/config/implementation/MessagesSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ public class MessagesSettings extends OkaeriConfig {
@Comment({
" ",
"# Configure the combat log notification displayed to players.",
"# You can use the {TIME} variable to display the remaining combat time.",
"# Placeholders: {SECONDS} - displays numeric value of seconds left in combat e.g. \"10\"",
"# {TIME} - displays formatted value with metric e.g \"10s\" or \"150ms\"",
" ",
})
public Notice combatNotification = BukkitNotice.builder()
Expand Down
1 change: 1 addition & 0 deletions eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/FightTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ public void run() {
.player(player.getUniqueId())
.notice(this.config.messagesSettings.combatNotification)
.placeholder("{TIME}", DurationUtil.format(remaining, this.config.messagesSettings.withoutMillis))
.placeholder("{SECONDS}", String.valueOf(remaining.toSeconds()))
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Mar 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The use of remaining.toSeconds() truncates the duration, which can be inconsistent with the {TIME} placeholder that appears to round up. For example, a remaining time of 19.9 seconds would result in {SECONDS} being "19" while {TIME} could be "20s". This can be confusing.

To ensure consistency, it's better to round up the seconds for the {SECONDS} placeholder as well.

Suggested change
.placeholder("{SECONDS}", String.valueOf(remaining.toSeconds()))
.placeholder("{SECONDS}", String.valueOf((remaining.toMillis() + 999) / 1000))

Copy link
Member Author

@CitralFlo CitralFlo Mar 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image The value stays consistent between each implementation. Using `withoutMillies: false` only gives visible change to the user

.send();

}
Expand Down