Merge pull request #110 from RedstoneFuture/improvements/fight-restart

Improvements/fight restart

missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/Config.java

@@ -22,18 +22,20 @@ import de.butzlabben.missilewars.Logger;
 import de.butzlabben.missilewars.MissileWars;
 import de.butzlabben.missilewars.game.GameManager;
 import de.butzlabben.missilewars.util.SetupUtil;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import static org.bukkit.Material.JUKEBOX;
-import static org.bukkit.Material.valueOf;
 import org.bukkit.World;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.bukkit.Material.JUKEBOX;
+import static org.bukkit.Material.valueOf;
+
 /**
  * @author Butzlabben
  * @since 01.01.2018
@@ -75,7 +77,7 @@ public class Config {
         cfg.addDefault("contact_auth_server", true);
         cfg.addDefault("prefetch_players", true);
 
-        cfg.addDefault("restart_after_fights", 10);
+        cfg.addDefault("restart_after_fights", -1);
 
         cfg.addDefault("arenas.folder", "plugins/MissileWars/arenas");
 

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

@@ -202,7 +202,7 @@ public class Game {
 
         Logger.DEBUG.log("Making game ready");
         ++fights;
-        if (fights >= Config.getFightRestart()) restart = true;
+        checkFightRestart();
 
         FightStats.checkTables();
         Logger.DEBUG.log("Fights: " + fights);
@@ -210,6 +210,12 @@ public class Game {
         ready = true;
     }
 
+    private void checkFightRestart() {
+        if (Config.getFightRestart() <= 0) return;
+
+        if (fights >= Config.getFightRestart()) restart = true;
+    }
+
     private void updateGameListener(GameBoundListener newListener) {
         if (listener != null) HandlerList.unregisterAll(listener);