Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,9 @@ private void process(@NonNull Cancellable e, @NonNull Island i, @Nullable Player
return;
}

// Increment the block number
is.incrementBlockNumber();

// Break the block
if (e instanceof BlockBreakEvent) {
this.breakBlock(player, block, nextBlock, i);
Expand All @@ -381,8 +384,6 @@ private void process(@NonNull Cancellable e, @NonNull Island i, @Nullable Player
Bukkit.getPluginManager().callEvent(new MagicBlockEvent(i, null, null, block, nextBlock.getMaterial()));
}

// Increment the block number
is.incrementBlockNumber();
}

private OneBlockPhase handleGoto(OneBlockIslands is, int gotoBlock) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,9 @@ private void tryToShowBossBar(UUID uuid, Island island) {
int phaseBlocks = addon.getOneBlockManager().getPhaseBlocks(obi);
int done = phaseBlocks - numBlocksToGo;
String translation = user.getTranslationOrNothing("aoneblock.bossbar.status", "[togo]",
String.valueOf(numBlocksToGo), "[total]", String.valueOf(phaseBlocks), "[done]", String.valueOf(done));
String.valueOf(numBlocksToGo), "[total]", String.valueOf(phaseBlocks), "[done]", String.valueOf(done),
"[phase-name]", obi.getPhaseName(), "[percent-done]",
Math.round(addon.getOneBlockManager().getPercentageDone(obi)) + "%");
bar.setTitle(translation);
// Add to user if they don't have it already
Player player = Bukkit.getPlayer(uuid);
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/locales/en-US.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ aoneblock:
bossbar:
title: "Blocks remaining"
# status: "&a Phase blocks &b [total]. Blocks left: [todo]"
# status: "&a [phase-name] : [percent-done]"
status: "&a Phase blocks &b [done] &d / &b [total]"
# RED, WHITE, PINK, BLUE, GREEN, YELLOW, or PURPLE
color: RED
Expand Down