fix countdown

boiscljo · Apr 2, 2022 · fd51d09 · fd51d09
1 parent 620d453
commit fd51d09
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/plugin/src/main/java/io/github/pronze/sba/listener/BedWarsListener.java b/plugin/src/main/java/io/github/pronze/sba/listener/BedWarsListener.java
@@ -203,15 +203,15 @@ public void run() {
 
                                 if (!time.contains("0-1")) {
                                     String[] units = time.split(":");
-                                    int seconds = Integer.parseInt(units[1]) + 1;
+                                    int seconds = Integer.parseInt(units[1]) + 1 + Integer.parseInt(units[0])*60;
                                     if (buffer == seconds)
                                         return;
                                     buffer = seconds;
                                     if (seconds <= 10) {
                                         var message = LanguageService
                                                 .getInstance()
                                                 .get(MessageKeys.GAME_STARTS_IN_MESSAGE)
-                                                .replace("%seconds%", String.valueOf(seconds))
+                                                .replace("%seconds%", seconds <=60 ? String.valueOf(seconds): game.getFormattedTimeLeft())
                                                 .toString();
 
                                         message = seconds == 1 ? message

diff --git a/plugin/src/main/java/io/github/pronze/sba/visuals/LobbyScoreboardManager.java b/plugin/src/main/java/io/github/pronze/sba/visuals/LobbyScoreboardManager.java
@@ -144,15 +144,15 @@ else if (game.getAvailableTeams().stream().allMatch(t -> t.getMaxPlayers() == 4)
 
         if (game.countConnectedPlayers() >= game.getMinPlayers()
                 && game.getStatus() == GameStatus.WAITING) {
-            final var time = ((org.screamingsandals.bedwars.game.Game) Main.getInstance().getGameByName(game.getName()))
-                    .getFormattedTimeLeft();
+            final var gameImpl = ((org.screamingsandals.bedwars.game.Game) game);
+            final var time =  gameImpl.getFormattedTimeLeft();
             if (!time.contains("0-1")) {
                 final var units = time.split(":");
-                var seconds = Integer.parseInt(units[1]) + 1;
+                int seconds = Integer.parseInt(units[1]) + 1 + Integer.parseInt(units[0])*60;
                 state = LanguageService
                         .getInstance()
                         .get(MessageKeys.LOBBY_SCOREBOARD_STATE)
-                        .replace("%countdown%", String.valueOf(seconds))
+                        .replace("%countdown%", seconds <=60 ? String.valueOf(seconds): gameImpl.getFormattedTimeLeft())
                         .toString();
             }
         }