Merge pull request #97 from RedstoneFuture/master

Misc Refactoring

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

@@ -60,7 +60,6 @@ import org.bukkit.event.HandlerList;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.scheduler.BukkitTask;
-import org.bukkit.scoreboard.Scoreboard;
 import org.bukkit.util.Vector;
 
 import java.util.HashMap;
@@ -198,10 +197,6 @@ public class Game {
         }
     }
 
-    public Scoreboard getScoreboard() {
-        return scoreboardManager.board;
-    }
-
     public void startGame() {
         if (Config.isSetup()) {
             Logger.WARN.log("Did not start game. Setup mode is still enabled");
@@ -259,7 +254,7 @@ public class Game {
 
         updateMOTD();
 
-        if (getArena().isSaveStatistics()) {
+        if (arena.isSaveStatistics()) {
             FightStats stats = new FightStats(this);
             stats.insert();
         }
@@ -334,15 +329,15 @@ public class Game {
             }
             
             if (message != null) {
-                broadcast(message.replace("%max_players%", Integer.toString(getLobby().getMaxSize()))
-                        .replace("%players%", Integer.toString(getPlayers().values().size()))
+                broadcast(message.replace("%max_players%", Integer.toString(lobby.getMaxSize()))
+                        .replace("%players%", Integer.toString(players.values().size()))
                         .replace("%player%", player.getName())
                         .replace("%team%", team.getFullname()));
             }
             
         }
 
-        player.setScoreboard(getScoreboard());
+        player.setScoreboard(scoreboardManager.getBoard());
 
         if (state == GameState.LOBBY) {
 
@@ -373,7 +368,7 @@ public class Game {
         boolean playerWasTeamMember = false;
 
         if (state == GameState.INGAME) {
-            BukkitTask task = getPlayerTasks().get(mwPlayer.getUuid());
+            BukkitTask task = playerTasks.get(mwPlayer.getUuid());
             if (task != null) task.cancel();
         }
         
@@ -397,8 +392,8 @@ public class Game {
             }
             
             if (message != null) {
-                broadcast(message.replace("%max_players%", Integer.toString(getLobby().getMaxSize()))
-                        .replace("%players%", Integer.toString(getPlayers().values().size()))
+                broadcast(message.replace("%max_players%", Integer.toString(lobby.getMaxSize()))
+                        .replace("%players%", Integer.toString(players.values().size()))
                         .replace("%player%", player.getName())
                         .replace("%team%", team.getFullname()));
             }
@@ -408,7 +403,7 @@ public class Game {
         player.setScoreboard(Bukkit.getScoreboardManager().getMainScoreboard());
 
         if (state == GameState.LOBBY) {
-            player.sendMessage(Messages.getMessage(true, Messages.MessageEnum.LOBBY_LEFT).replace("%lobby_name%", getLobby().getDisplayName()));
+            player.sendMessage(Messages.getMessage(true, Messages.MessageEnum.LOBBY_LEFT).replace("%lobby_name%", lobby.getDisplayName()));
         } else if (state == GameState.INGAME) {
             player.sendMessage(Messages.getMessage(true, Messages.MessageEnum.GAME_LEFT).replace("%arena_name%", arena.getDisplayName()));
         }
@@ -423,7 +418,7 @@ public class Game {
      */
     private void runTeleportEventForPlayer(Player player) {
         Bukkit.getPluginManager().callEvent(new PlayerTeleportEvent(player,
-                Config.getFallbackSpawn(), getLobby().getSpawnPoint()));
+                Config.getFallbackSpawn(), lobby.getSpawnPoint()));
     }
 
     private void checkTeamSize(Team team) {
@@ -761,7 +756,7 @@ public class Game {
      */
     public void updateGameInfo() {
         MissileWars.getInstance().getSignRepository().getSigns(this).forEach(MWSign::update);
-        getScoreboardManager().resetScoreboard();
+        scoreboardManager.resetScoreboard();
         Logger.DEBUG.log("Updated signs and scoreboard.");
     }
 
@@ -780,13 +775,13 @@ public class Game {
     }
 
     public boolean isPlayersMax() {
-        int maxSize = getLobby().getMaxSize();
+        int maxSize = lobby.getMaxSize();
         int currentSize = team1.getMembers().size() + team2.getMembers().size();
         return currentSize >= maxSize;
     }
 
     public boolean isSpectatorsMax() {
-        int maxSize = getArena().getMaxSpectators();
+        int maxSize = arena.getMaxSpectators();
 
         if (maxSize == -1) return false;
 
@@ -805,14 +800,14 @@ public class Game {
     }
 
     public void teleportToLobbySpawn(Player player) {
-        player.teleport(getLobby().getSpawnPoint());
+        player.teleport(lobby.getSpawnPoint());
     }
 
     public void teleportToArenaSpectatorSpawn(Player player) {
-        player.teleport(getArena().getSpectatorSpawn());
+        player.teleport(arena.getSpectatorSpawn());
     }
 
     public void teleportToAfterGameSpawn(Player player) {
-        player.teleport(getLobby().getAfterGameSpawn());
+        player.teleport(lobby.getAfterGameSpawn());
     }
 }

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

@@ -20,7 +20,6 @@ package de.butzlabben.missilewars.game;
 
 import de.butzlabben.missilewars.Logger;
 import de.butzlabben.missilewars.configuration.Config;
-import de.butzlabben.missilewars.configuration.Lobby;
 import de.butzlabben.missilewars.configuration.Messages;
 import lombok.Getter;
 import lombok.ToString;
@@ -73,16 +72,6 @@ public class GameWorld {
         }
     }
 
-    public void sendPlayersBack() {
-        synchronized (lock) {
-            World w = Bukkit.getWorld(worldName);
-            if (w == null)
-                return;
-            Lobby lobby = game.getLobby();
-            w.getEntities().stream().filter((f) -> f instanceof Player).forEach(p -> p.teleport(lobby.getAfterGameSpawn()));
-        }
-    }
-
     public void unload() {
         synchronized (lock) {
             World w = Bukkit.getWorld(worldName);

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

@@ -24,6 +24,7 @@ import de.butzlabben.missilewars.game.Game;
 import de.butzlabben.missilewars.game.Team;
 import de.butzlabben.missilewars.game.enums.GameState;
 import de.butzlabben.missilewars.player.MWPlayer;
+import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -54,7 +55,7 @@ public class ScoreboardManager {
     private boolean isTeam1ListUsed = false;
     private boolean isTeam2ListUsed = false;
 
-    public Scoreboard board;
+    @Getter private Scoreboard board;
     private Objective obj;
     private HashMap<Integer, org.bukkit.scoreboard.Team> teams = new HashMap<>();
     private static final String[] COLOR_CODES = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f"};