Browse Source

Refactoring

RedstoneFuture 1 year ago
parent
commit
1a3d3f3cf5

+ 1 - 6
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");
@@ -342,7 +337,7 @@ public class Game {
             
         }
 
-        player.setScoreboard(getScoreboard());
+        player.setScoreboard(getScoreboardManager().getBoard());
 
         if (state == GameState.LOBBY) {
 

+ 2 - 1
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"};