Просмотр исходного кода

fixing scoreboard bug in lobby, increasing restart time

RedstoneFuture 3 лет назад
Родитель
Сommit
7144da335d

+ 1 - 1
missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/timer/EndTimer.java

@@ -36,7 +36,7 @@ public class EndTimer extends Timer {
     public void tick() {
 
         switch(seconds) {
-            case 20:
+            case 15:
                 broadcast(MessageConfig.getMessage("game_starts_new_in").replace("%seconds%", Integer.toString(seconds)));
                 break;
             case 0:

+ 7 - 1
missilewars-plugin/src/main/java/de/butzlabben/missilewars/util/ScoreboardManager.java

@@ -20,6 +20,7 @@ package de.butzlabben.missilewars.util;
 
 import de.butzlabben.missilewars.Config;
 import de.butzlabben.missilewars.game.Game;
+import de.butzlabben.missilewars.game.GameState;
 import de.butzlabben.missilewars.wrapper.abstracts.Arena;
 import de.butzlabben.missilewars.wrapper.game.Team;
 import de.butzlabben.missilewars.wrapper.player.MWPlayer;
@@ -227,7 +228,12 @@ public class ScoreboardManager {
      */
     private String replaceScoreboardPlaceholders(String text) {
 
-        String time = Integer.toString(game.getTimer().getSeconds() / 60);
+        String time;
+        if (game.getState() == GameState.LOBBY) {
+            time = Integer.toString(game.getArena().getGameDuration());
+        } else {
+            time = Integer.toString(game.getTimer().getSeconds() / 60);
+        }
 
 
         text = ChatColor.translateAlternateColorCodes('&', text);