diff --git a/src/main/java/world/bentobox/aoneblock/listeners/BlockListener.java b/src/main/java/world/bentobox/aoneblock/listeners/BlockListener.java index c1de47a..e2caa05 100644 --- a/src/main/java/world/bentobox/aoneblock/listeners/BlockListener.java +++ b/src/main/java/world/bentobox/aoneblock/listeners/BlockListener.java @@ -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); @@ -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) { diff --git a/src/main/java/world/bentobox/aoneblock/listeners/BossBarListener.java b/src/main/java/world/bentobox/aoneblock/listeners/BossBarListener.java index ef834b2..7dcec28 100644 --- a/src/main/java/world/bentobox/aoneblock/listeners/BossBarListener.java +++ b/src/main/java/world/bentobox/aoneblock/listeners/BossBarListener.java @@ -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); diff --git a/src/main/resources/locales/en-US.yml b/src/main/resources/locales/en-US.yml index fe6d057..3345596 100755 --- a/src/main/resources/locales/en-US.yml +++ b/src/main/resources/locales/en-US.yml @@ -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