Merge pull request #49 from RedstoneFuture/Refactoring/Misc

Small Refactoring and Fix

missilewars-plugin/src/main/java/de/butzlabben/missilewars/MissileWars.java

@@ -89,8 +89,7 @@ public class MissileWars extends JavaPlugin {
 
         new File(Config.getLobbiesFolder()).mkdirs();
 
-        SignRepository repository = SignRepository.load();
-        this.signRepository = repository;
+        this.signRepository = SignRepository.load();
 
         registerEvents();
         registerCommands();
@@ -176,6 +175,8 @@ public class MissileWars extends JavaPlugin {
      */
     private void deleteTempWorlds() {
         File[] dirs = Bukkit.getWorldContainer().listFiles();
+        if (dirs == null) return;
+        
         for (File dir : dirs) {
             if (dir.getName().startsWith("mw-")) {
                 try {

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

@@ -88,7 +88,7 @@ public class Game {
     private final HashMap<UUID, BukkitTask> playerTasks = new HashMap<>();
     private Timer timer;
     private BukkitTask bt;
-    private GameState state;
+    private GameState state = GameState.LOBBY;
     private Team team1;
     private Team team2;
     private boolean ready = false;
@@ -140,8 +140,7 @@ public class Game {
 
         Logger.DEBUG.log("Registering, teleporting, etc. all players");
 
-        // Change MOTD
-        if (!Config.isMultipleLobbies()) MotdManager.getInstance().updateMOTD(this);
+        updateMOTD();
 
         Logger.DEBUG.log("Start timer");
 
@@ -198,6 +197,12 @@ public class Game {
         this.listener = newListener;
     }
 
+    private void updateMOTD() {
+        if (!Config.isMultipleLobbies()) {
+            MotdManager.getInstance().updateMOTD(this);
+        }
+    }
+
     public Scoreboard getScoreboard() {
         return scoreboardManager.board;
     }
@@ -225,9 +230,7 @@ public class Game {
 
         applyForAllPlayers(this::startForPlayer);
 
-        // Change MOTD
-        if (!Config.isMultipleLobbies())
-            MotdManager.getInstance().updateMOTD(this);
+        updateMOTD();
 
         Bukkit.getPluginManager().callEvent(new GameStartEvent(this));
     }
@@ -261,10 +264,7 @@ public class Game {
         bt = Bukkit.getScheduler().runTaskTimer(MissileWars.getInstance(), timer, 5, 20);
         state = GameState.END;
 
-        // Change MOTD
-        if (!Config.isMultipleLobbies()) {
-            MotdManager.getInstance().updateMOTD(this);
-        }
+        updateMOTD();
 
         if (getArena().isSaveStatistics()) {
             FightStats stats = new FightStats(this);

missilewars-plugin/src/main/java/de/butzlabben/missilewars/util/MissileWarsPlaceholder.java

@@ -50,7 +50,7 @@ public class MissileWarsPlaceholder extends PlaceholderExpansion {
         return "0.0.1";
     }
 
-    // This is required or else PlaceholderAPI will unregister the Expansion on reload
+    // This is required or else PlaceholderAPI will unregister the expansion on reload
     @Override
     public boolean persist() {
         return true;
@@ -98,7 +98,7 @@ public class MissileWarsPlaceholder extends PlaceholderExpansion {
             }
         }
 
-        // Placeholder is unknown by the Expansion
+        // Placeholder is unknown by the expansion
         return null;
     }
 

missilewars-plugin/src/main/java/de/butzlabben/missilewars/wrapper/abstracts/MapChooseProcedure.java

@@ -18,6 +18,13 @@
 
 package de.butzlabben.missilewars.wrapper.abstracts;
 
+/**
+ * @author Butzlabben
+ * @since 01.01.2018
+ */
 public enum MapChooseProcedure {
-    FIRST, MAPCYCLE, MAPVOTING
+
+    FIRST,
+    MAPCYCLE,
+    MAPVOTING
 }

missilewars-plugin/src/main/java/de/butzlabben/missilewars/wrapper/missile/paste/R1_12PasteProvider.java

@@ -23,10 +23,15 @@ import de.butzlabben.missilewars.MissileWars;
 import de.butzlabben.missilewars.missile.paste.r1_12.R1_12Paster;
 import de.butzlabben.missilewars.util.version.ColorConverter;
 import de.butzlabben.missilewars.wrapper.game.Team;
-import java.io.File;
 import org.bukkit.World;
 import org.bukkit.util.Vector;
 
+import java.io.File;
+
+/**
+ * @author Butzlabben
+ * @since 23.09.2018
+ */
 public class R1_12PasteProvider implements Paster {
 
     R1_12Paster paster = new R1_12Paster();

missilewars-plugin/src/main/java/de/butzlabben/missilewars/wrapper/missile/paste/R1_13FawePasteProvider.java

@@ -20,24 +20,30 @@ package de.butzlabben.missilewars.wrapper.missile.paste;
 
 import de.butzlabben.missilewars.Config;
 import de.butzlabben.missilewars.MissileWars;
+import de.butzlabben.missilewars.missile.paste.r1_13.fawe.R1_13Paster;
 import de.butzlabben.missilewars.util.version.ColorConverter;
 import de.butzlabben.missilewars.wrapper.game.Team;
-import java.io.File;
 import org.bukkit.World;
 import org.bukkit.util.Vector;
 
+import java.io.File;
+
+/**
+ * @author Butzlabben
+ * @since 23.09.2018
+ */
 public class R1_13FawePasteProvider implements Paster {
 
-    de.butzlabben.missilewars.missile.paste.r1_13.fawe.R1_13Paster platformPaster = new de.butzlabben.missilewars.missile.paste.r1_13.fawe.R1_13Paster();
+    R1_13Paster paster = new R1_13Paster();
 
     @Override
     public void pasteMissile(File schematic, Vector position, int rotation, World world, Team team) {
-        platformPaster.pasteMissile(schematic, position, rotation, world, ColorConverter.getGlassFromColorCode(team.getColorCode()),
+        paster.pasteMissile(schematic, position, rotation, world, ColorConverter.getGlassFromColorCode(team.getColorCode()),
                 Config.getReplaceRadius(), Config.getStartReplace(), MissileWars.getInstance(), Config.getReplaceTicks());
     }
 
     @Override
     public void pasteSchematic(File schematic, Vector position, World world) {
-        platformPaster.pasteSchematic(schematic, position, world);
+        paster.pasteSchematic(schematic, position, world);
     }
 }

missilewars-plugin/src/main/java/de/butzlabben/missilewars/wrapper/missile/paste/R1_13WEPasteProvider.java

@@ -23,10 +23,15 @@ import de.butzlabben.missilewars.MissileWars;
 import de.butzlabben.missilewars.missile.paste.r1_13.we.R1_13Paster;
 import de.butzlabben.missilewars.util.version.ColorConverter;
 import de.butzlabben.missilewars.wrapper.game.Team;
-import java.io.File;
 import org.bukkit.World;
 import org.bukkit.util.Vector;
 
+import java.io.File;
+
+/**
+ * @author Butzlabben
+ * @since 23.09.2018
+ */
 public class R1_13WEPasteProvider implements Paster {
 
     R1_13Paster paster = new R1_13Paster();

missilewars-plugin/src/main/java/de/butzlabben/missilewars/wrapper/missile/paste/R1_16FawePasteProvider.java

@@ -20,27 +20,30 @@ package de.butzlabben.missilewars.wrapper.missile.paste;
 
 import de.butzlabben.missilewars.Config;
 import de.butzlabben.missilewars.MissileWars;
+import de.butzlabben.missilewars.missile.paste.r1_16.fawe.R1_16Paster;
 import de.butzlabben.missilewars.util.version.ColorConverter;
 import de.butzlabben.missilewars.wrapper.game.Team;
-import java.io.File;
 import org.bukkit.World;
 import org.bukkit.util.Vector;
 
+import java.io.File;
+
 /**
- * @author Daniel Nägele
+ * @author Butzlabben
+ * @since 23.09.2018
  */
 public class R1_16FawePasteProvider implements Paster {
 
-    de.butzlabben.missilewars.missile.paste.r1_16.fawe.R1_16Paster platformPaster = new de.butzlabben.missilewars.missile.paste.r1_16.fawe.R1_16Paster();
+    R1_16Paster paster = new R1_16Paster();
 
     @Override
     public void pasteMissile(File schematic, Vector position, int rotation, World world, Team team) {
-        platformPaster.pasteMissile(schematic, position, rotation, world, ColorConverter.getGlassFromColorCode(team.getColorCode()),
+        paster.pasteMissile(schematic, position, rotation, world, ColorConverter.getGlassFromColorCode(team.getColorCode()),
                 Config.getReplaceRadius(), Config.getStartReplace(), MissileWars.getInstance(), Config.getReplaceTicks());
     }
 
     @Override
     public void pasteSchematic(File schematic, Vector position, World world) {
-        platformPaster.pasteSchematic(schematic, position, world);
+        paster.pasteSchematic(schematic, position, world);
     }
 }