From dfb5999d02511c53579a3ee5fa01a0bd0cc867ea Mon Sep 17 00:00:00 2001
From: Xander <xander@biltopia.org>
Date: Sun, 15 Sep 2024 00:50:24 +0200
Subject: [PATCH] make ScoreBoard private for TeamScoreBoard

---
 .../java/gent/zeus/mc13dtl/TeamScoreBoard.java    | 15 ++++++++++++---
 .../zeus/mc13dtl/events/RandomEventRunner.java    |  2 +-
 .../zeus/mc13dtl/group/GroupRemoveCommand.java    |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/java/gent/zeus/mc13dtl/TeamScoreBoard.java b/src/main/java/gent/zeus/mc13dtl/TeamScoreBoard.java
index f0e3713..80d5ebc 100644
--- a/src/main/java/gent/zeus/mc13dtl/TeamScoreBoard.java
+++ b/src/main/java/gent/zeus/mc13dtl/TeamScoreBoard.java
@@ -8,11 +8,12 @@ import org.bukkit.scoreboard.*;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 public class TeamScoreBoard {
 
-    public ScoreboardManager sm;
-    public Scoreboard scoreboard;
+    private ScoreboardManager sm;
+    private Scoreboard scoreboard;
 
     private Objective objective;
 
@@ -54,11 +55,19 @@ public class TeamScoreBoard {
         return team;
     }
 
+    public Set<Team> getTeams() {
+        return scoreboard.getTeams();
+    }
+
+    public Team getTeam(Player player) {
+        return this.scoreboard.getEntryTeam(player.getUniqueId().toString());
+    }
+
     public void addToTeam(Player player, Team team) {
         team.addPlayer(player);
         team.addEntry(player.getUniqueId().toString());
         player.sendRichMessage("<rainbow>You have been added to team " + team.getName());
-        MC13DTL.board.setScore(team, 0);
+        this.setScore(team, 0);
         player.setGlowing(true);
     }
 
diff --git a/src/main/java/gent/zeus/mc13dtl/events/RandomEventRunner.java b/src/main/java/gent/zeus/mc13dtl/events/RandomEventRunner.java
index d98b9ae..4baace8 100644
--- a/src/main/java/gent/zeus/mc13dtl/events/RandomEventRunner.java
+++ b/src/main/java/gent/zeus/mc13dtl/events/RandomEventRunner.java
@@ -16,7 +16,7 @@ public class RandomEventRunner implements Runnable {
     long lastRunDay = world.getPersistentDataContainer().get(eventKey, PersistentDataType.LONG);
     long day = Bukkit.getWorld("world").getFullTime() / 24000;
     if (day > lastRunDay && Bukkit.getWorld("world").getTime() >= 14000) {
-      for (Team i : MC13DTL.board.scoreboard.getTeams()) {
+      for (Team i : MC13DTL.board.getTeams()) {
         RandomEventExecutor.executeRandomEvent(i);
       }
       world.getPersistentDataContainer().set(eventKey, PersistentDataType.LONG, day);
diff --git a/src/main/java/gent/zeus/mc13dtl/group/GroupRemoveCommand.java b/src/main/java/gent/zeus/mc13dtl/group/GroupRemoveCommand.java
index 3f0805f..1756c79 100644
--- a/src/main/java/gent/zeus/mc13dtl/group/GroupRemoveCommand.java
+++ b/src/main/java/gent/zeus/mc13dtl/group/GroupRemoveCommand.java
@@ -15,7 +15,7 @@ public class GroupRemoveCommand implements BasicCommand {
         if (args.length > 0) {
             Player player = Bukkit.getPlayerExact(args[0]);
             if (player != null) {
-                Team team = MC13DTL.board.scoreboard.getEntryTeam(player.getUniqueId().toString());
+                Team team = MC13DTL.board.getTeam(player);
                 if (team != null) {
                     team.removeEntry(player.getName());
                     player.sendMessage("You have been removed from your team");