📝 Fix sync between message, scoreboard and holograù

This commit is contained in:
Maxlego08 2024-02-22 20:02:55 +01:00
parent 301de953c0
commit e696b80e74
2 changed files with 14 additions and 3 deletions

View File

@ -337,6 +337,7 @@ public class ZKoth extends ZUtils implements Koth {
return; return;
} }
this.plugin.getScoreBoardManager().update();
this.remainingSeconds.decrementAndGet(); this.remainingSeconds.decrementAndGet();
}); });
} }
@ -421,6 +422,7 @@ public class ZKoth extends ZUtils implements Koth {
this.currentPlayer = player; this.currentPlayer = player;
this.startCap(player); this.startCap(player);
this.plugin.getKothHologram().update(this); this.plugin.getKothHologram().update(this);
this.plugin.getScoreBoardManager().update();
} else if (this.currentPlayer != null && !cuboid.contains(this.currentPlayer.getLocation())) { } else if (this.currentPlayer != null && !cuboid.contains(this.currentPlayer.getLocation())) {
@ -432,6 +434,7 @@ public class ZKoth extends ZUtils implements Koth {
if (event.isCancelled()) return; if (event.isCancelled()) return;
this.plugin.getKothHologram().update(this); this.plugin.getKothHologram().update(this);
this.plugin.getScoreBoardManager().update();
broadcast(Message.EVENT_LOOSE); broadcast(Message.EVENT_LOOSE);
if (this.timerTask != null) { if (this.timerTask != null) {
@ -475,6 +478,7 @@ public class ZKoth extends ZUtils implements Koth {
// this.changeBlocks(Config.onePersonneCapturingMaterial, false); // this.changeBlocks(Config.onePersonneCapturingMaterial, false);
this.plugin.getKothHologram().update(this); this.plugin.getKothHologram().update(this);
this.plugin.getScoreBoardManager().update();
scheduleFix(this.plugin, 0, 1000, (task, isCancelled) -> { scheduleFix(this.plugin, 0, 1000, (task, isCancelled) -> {
@ -496,6 +500,7 @@ public class ZKoth extends ZUtils implements Koth {
if (!this.currentPlayer.isValid() || !this.currentPlayer.isOnline() || !cuboid.contains(this.currentPlayer.getLocation())) { if (!this.currentPlayer.isValid() || !this.currentPlayer.isOnline() || !cuboid.contains(this.currentPlayer.getLocation())) {
this.currentPlayer = null; this.currentPlayer = null;
this.plugin.getKothHologram().update(this); this.plugin.getKothHologram().update(this);
this.plugin.getScoreBoardManager().update();
} }
} }
@ -522,6 +527,7 @@ public class ZKoth extends ZUtils implements Koth {
} }
this.plugin.getKothHologram().update(this); this.plugin.getKothHologram().update(this);
this.plugin.getScoreBoardManager().update();
return; return;
} }
@ -542,6 +548,7 @@ public class ZKoth extends ZUtils implements Koth {
} }
this.plugin.getKothHologram().update(this); this.plugin.getKothHologram().update(this);
this.plugin.getScoreBoardManager().update();
switch (this.kothType) { switch (this.kothType) {
case CAPTURE: case CAPTURE:
@ -572,8 +579,6 @@ public class ZKoth extends ZUtils implements Koth {
this.plugin.getScoreBoardManager().clearBoard(); this.plugin.getScoreBoardManager().clearBoard();
/* Gestion des loots */
this.endCommands.forEach(command -> { this.endCommands.forEach(command -> {
if (command.contains("%online-player%")) { if (command.contains("%online-player%")) {
for (Player cPlayer : this.kothTeam.getOnlinePlayer(player)) { for (Player cPlayer : this.kothTeam.getOnlinePlayer(player)) {

View File

@ -72,6 +72,12 @@ public class ScoreBoardManager extends ZUtils {
}); });
} }
public void update(){
this.boards.forEach((player, board) -> {
board.updateLines(this.lines.accept(player));
});
}
public FastBoard createBoard(Player player, String title) { public FastBoard createBoard(Player player, String title) {
if (this.hasBoard(player)) { if (this.hasBoard(player)) {
@ -211,7 +217,7 @@ public class ScoreBoardManager extends ZUtils {
*/ */
public void setLinesAndSchedule(CollectionConsumer<Player> lines) { public void setLinesAndSchedule(CollectionConsumer<Player> lines) {
this.lines = lines; this.lines = lines;
this.schedule(); // this.schedule();
} }
public KothScoreboard getScoreboard() { public KothScoreboard getScoreboard() {