Skip to content

Commit a3a3690

Browse files
committed
fix(attackers): fix winning message for attackers
1 parent 2ef49ae commit a3a3690

File tree

3 files changed

+22
-2
lines changed

3 files changed

+22
-2
lines changed

src/main/java/fr/lliksel/skydefender/listeners/GameListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public void onBlockBreak(BlockBreakEvent event) {
141141
}
142142

143143
Bukkit.broadcastMessage(ChatColor.GOLD + "La bannière a été détruite par " + player.getDisplayName() + " !");
144-
Bukkit.broadcastMessage(ChatColor.GOLD + "Les attaquants remportent la victoire !");
144+
Bukkit.broadcastMessage(ChatColor.GOLD + "L'équipe \"" + playerTeamOpt.get().getColor() + playerTeamOpt.get().getName() + ChatColor.GOLD + "\" remporte la victoire !");
145145
gameManager.setGameState(GameState.FINISH);
146146
}
147147

src/main/java/fr/lliksel/skydefender/manager/GameManager.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,20 @@ public String getGameTime() {
5656
return String.format("%02d:%02d", minutes, seconds);
5757
}
5858

59+
public String getRemainingPvpTime() {
60+
if (gameState != GameState.PLAYING) return null;
61+
62+
long elapsedSeconds = (System.currentTimeMillis() - gameStartTime) / 1000;
63+
long pvpTimeSeconds = gameConfigManager.getPvpTimeMinutes() * 60;
64+
long remaining = pvpTimeSeconds - elapsedSeconds;
65+
66+
if (remaining <= 0) return null;
67+
68+
long minutes = remaining / 60;
69+
long seconds = remaining % 60;
70+
return String.format("%02d:%02d", minutes, seconds);
71+
}
72+
5973
public void setGameState(GameState gameState) {
6074
if (this.gameState == gameState) return;
6175

src/main/java/fr/lliksel/skydefender/manager/ScoreboardManager.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,13 @@ private void updateScoreboard(Player player) {
5656

5757
setScore(objective, ChatColor.GRAY + "------------------", 15);
5858
setScore(objective, ChatColor.YELLOW + "Temps: " + ChatColor.WHITE + gameManager.getGameTime(), 14);
59-
setScore(objective, " ", 13);
59+
60+
String pvpTimer = gameManager.getRemainingPvpTime();
61+
if (pvpTimer != null) {
62+
setScore(objective, ChatColor.AQUA + "PvP: " + ChatColor.WHITE + pvpTimer, 13);
63+
} else {
64+
setScore(objective, " ", 13);
65+
}
6066

6167
Optional<GameTeam> team = teamManager.getPlayerTeam(player);
6268
String teamName = team.map(gameTeam -> gameTeam.getColor() + gameTeam.getName()).orElse(ChatColor.GRAY + "Aucune");

0 commit comments

Comments
 (0)