Merge pull request #106 from RedstoneFuture/fix/game-startup

Fix/game startup

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/Game.java

@@ -153,6 +153,8 @@ public class Game {
             return;
         }
 
+        scoreboardManager = new ScoreboardManager(this);
+
         // choose the game arena
         if (lobby.getMapChooseProcedure() == MapChooseProcedure.FIRST) {
             setArena(lobby.getArenas().get(0));
@@ -173,11 +175,10 @@ public class Game {
                 prepareGame();
             } else {
                 mapVoting.startVote();
+                scoreboardManager.resetScoreboard();
             }
         }
 
-        scoreboardManager = new ScoreboardManager(this);
-        scoreboardManager.createScoreboard();
     }
 
     /**

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/misc/ScoreboardManager.java

@@ -68,7 +68,7 @@ public class ScoreboardManager {
     /**
      * This method registers the scoreboard.
      */
-    public void createScoreboard() {
+    private void createScoreboard() {
 
         team1 = game.getTeam1();
         team2 = game.getTeam2();

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/timer/LobbyTimer.java

@@ -20,6 +20,7 @@ package de.butzlabben.missilewars.game.timer;
 
 import de.butzlabben.missilewars.configuration.Messages;
 import de.butzlabben.missilewars.game.Game;
+import de.butzlabben.missilewars.game.enums.MapChooseProcedure;
 import de.butzlabben.missilewars.player.MWPlayer;
 import org.bukkit.Sound;
 
@@ -79,7 +80,8 @@ public class LobbyTimer extends Timer implements Runnable {
                 playPling();
                 break;
             case 10:
-                getGame().getMapVoting().setVotedArena();
+                if (getGame().getLobby().getMapChooseProcedure() == MapChooseProcedure.MAPVOTING)
+                    getGame().getMapVoting().setVotedArena();
                 broadcast(Messages.getMessage(true, Messages.MessageEnum.LOBBY_TIMER_GAME_STARTS_IN).replace("%seconds%", Integer.toString(seconds)));
                 playPling();
                 break;