Scoreboard numbers on the side start from 1 instead of 4.

Fixed the bug that occurred when placing a wall torch.

The amount of minutes the player has been in game is saved to file now.

Players are reminded of how many minutes they have left to complete the game now.

src/main/java/net/dohaw/ironcraft/IronCraftPlugin.java

@@ -161,7 +161,6 @@ public Location getRandomChamber() {
     }
 
     public Location getRandomJourneySpawnPoint() {
-        System.out.println("SPAWN LOCATIONS: " + journeySpawnPoints);
         return journeySpawnPoints.get(new Random().nextInt(journeySpawnPoints.size()));
     }
 
@@ -177,8 +176,14 @@ public void updateScoreboard(Player player) {
 
         if(!playerData.isManager()){
 
+            // If they aren't in the tutorial, then they don't need the objectives on the side of their screen.
+            if(!playerData.isInTutorial()){
+                player.setScoreboard(manager.getNewScoreboard());
+                return;
+            }
+
             int currentObjectiveOrdinal = playerData.getCurrentTutorialObjective().ordinal();
-            int counter = 4;
+            int counter = 1;
             for (Objective objective : Objective.values()) {
 
                 Score objScore;

src/main/java/net/dohaw/ironcraft/PlayerData.java

@@ -507,6 +507,14 @@ public void setManagerFeedback(String managerFeedback) {
         this.managerFeedback = managerFeedback;
     }
 
+    public int getMinutesInGame() {
+        return minutesInGame;
+    }
+
+    public void setMinutesInGame(int minutesInGame) {
+        this.minutesInGame = minutesInGame;
+    }
+
     public void writeDataToFile(IronCraftPlugin plugin) throws IOException {
 
         File file = new File(plugin.getDataFolder() + File.separator + "end_game_data", "input_" + uuid.toString() + ".yml");

src/main/java/net/dohaw/ironcraft/Reminder.java

@@ -53,6 +53,12 @@ public void run() {
                 message = PLAYER_REMINDERS.get(currentIndexReminder);
                 playerIndexReminders.put(uuid, currentIndexReminder);
 
+                // Reminds them of how much time they have left if they are in the actual game.
+                if(!data.isInTutorial()){
+                    int minutesInGame = data.getMinutesInGame();
+                    player.sendMessage(StringUtils.colorString("&7You have &e" + (7 - minutesInGame) + "&7 minutes to complete the game!"));
+                }
+
             }
             player.spigot().sendMessage(ChatMessageType.ACTION_BAR, new TextComponent(StringUtils.colorString(message)));
 

src/main/java/net/dohaw/ironcraft/config/PlayerDataConfig.java

@@ -24,6 +24,7 @@ public PlayerData loadData() {
         playerData.setInTutorial(config.getBoolean("Is In Tutorial"));
         playerData.setChamberLocation(config.getLocation("Chamber Location"));
         playerData.setCurrentTutorialObjective(Objective.valueOf(config.getString("Tutorial Objective")));
+        playerData.setMinutesInGame(config.getInt("Minutes In Game"));
 
         return playerData;
     }
@@ -34,6 +35,7 @@ public void saveData(PlayerData data) {
         config.set("Is In Tutorial", data.isInTutorial());
         config.set("Chamber Location", data.getChamberLocation());
         config.set("Tutorial Objective", data.getCurrentTutorialObjective().toString());
+        config.set("Minutes In Game", data.getMinutesInGame());
         saveConfig();
     }
 

src/main/java/net/dohaw/ironcraft/listener/ObjectiveWatcher.java

@@ -107,7 +107,7 @@ public void onPlaceTorch(BlockPlaceEvent e) {
         Player player = e.getPlayer();
         PlayerData playerData = getPlayerData(player);
         Material blockPlacedType = e.getBlockPlaced().getType();
-        if (playerData.getCurrentTutorialObjective() == Objective.PLACE_A_TORCH && blockPlacedType == Material.TORCH || blockPlacedType == Material.WALL_TORCH) {
+        if (playerData.getCurrentTutorialObjective() == Objective.PLACE_A_TORCH && (blockPlacedType == Material.TORCH || blockPlacedType == Material.WALL_TORCH) ) {
             playerData.setCurrentTutorialObjective(plugin.getNextObjective(Objective.PLACE_A_TORCH));
             Bukkit.getServer().getPluginManager().callEvent(new CompleteObjectiveEvent(playerData));
         }