Refactoring updater and fix exceptions

Author: IWareQ

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>me.iwareq.scoreboard</groupId>
 	<artifactId>ScoreboardAPI</artifactId>
-	<version>2.1</version>
+	<version>2.1.1</version>
 
 	<properties>
 		<maven.compiler.source>8</maven.compiler.source>

src/main/java/me/iwareq/scoreboard/Scoreboard.java

@@ -3,7 +3,6 @@
 import cn.nukkit.Player;
 import cn.nukkit.Server;
 import lombok.Getter;
-import lombok.ToString;
 import me.iwareq.scoreboard.line.ScoreboardLine;
 import me.iwareq.scoreboard.manager.ScoreboardManager;
 import me.iwareq.scoreboard.packet.RemoveObjectivePacket;
@@ -20,31 +19,24 @@
 import java.util.Set;
 import java.util.function.BiConsumer;
 
-@ToString
 public class Scoreboard {
 
-	@Getter
-	private final Set<Player> viewers = new HashSet<>();
-
 	private final String displayName;
-
-	private final Map<Integer, ScoreboardLine> lines = new HashMap<>();
-
 	private final BiConsumer<Scoreboard, Player> callback;
-
 	private final ScoreboardManager manager;
+
 	@Getter
-	private final int updateTime;
+	private final Set<Player> viewers = new HashSet<>();
+	private final Map<Integer, ScoreboardLine> lines = new HashMap<>();
 
 	private int lastIndex;
 
 	public Scoreboard(String displayName, BiConsumer<Scoreboard, Player> callback, int updateTime) {
 		this.displayName = displayName;
 		this.callback = callback;
-		this.updateTime = updateTime;
 		this.manager = ScoreboardAPI.getInstance().getScoreboardManager();
 
-		Server.getInstance().getScheduler().scheduleRepeatingTask(new ScoreboardUpdater(this), 20, true);
+		Server.getInstance().getScheduler().scheduleRepeatingTask(new ScoreboardUpdater(this), updateTime, true);
 	}
 
 	public void setLine(int index, String text) {
@@ -73,18 +65,18 @@ private void checkLineIndex(int index) {
 	public void refresh() {
 		this.lines.clear();
 		this.lastIndex = 0;
-		this.viewers.removeIf(p -> {
-			boolean remove = !p.isConnected() || !p.isOnline();
+		this.viewers.removeIf(viewer -> {
+			boolean remove = !viewer.isConnected() || !viewer.isOnline();
 			if (remove) {
-				this.manager.removeScoreboard(p);
+				this.manager.removeScoreboard(viewer);
 			}
 
 			return remove;
 		});
 
-		this.viewers.forEach(player -> {
-			this.hide(player, false);
-			this.show(player, false);
+		this.viewers.forEach(viewer -> {
+			this.hide(viewer, false);
+			this.show(viewer, false);
 		});
 	}
 
@@ -112,7 +104,7 @@ private void show(Player player, boolean add) {
 			player.dataPacket(scorePacket);
 
 			if (add) {
-				this.manager.addScoreboard(player, this);
+				this.manager.setScoreboard(player, this);
 			}
 		}
 	}

src/main/java/me/iwareq/scoreboard/ScoreboardAPI.java

@@ -8,6 +8,7 @@ public class ScoreboardAPI extends PluginBase {
 
 	@Getter
 	private static ScoreboardAPI instance;
+
 	@Getter
 	private ScoreboardManager scoreboardManager;
 

src/main/java/me/iwareq/scoreboard/manager/ScoreboardManager.java

@@ -4,19 +4,19 @@
 import lombok.Getter;
 import me.iwareq.scoreboard.Scoreboard;
 
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class ScoreboardManager {
 
 	@Getter
-	private final Map<String, Scoreboard> scoreboards = new HashMap<>();
+	private final Map<String, Scoreboard> scoreboards = new ConcurrentHashMap<>();
 
 	public Scoreboard getScoreboard(Player player) {
 		return this.scoreboards.get(player.getName());
 	}
 
-	public void addScoreboard(Player player, Scoreboard scoreboard) {
+	public void setScoreboard(Player player, Scoreboard scoreboard) {
 		this.scoreboards.put(player.getName(), scoreboard);
 	}
 

src/main/java/me/iwareq/scoreboard/updater/ScoreboardUpdater.java

@@ -1,26 +1,16 @@
 package me.iwareq.scoreboard.updater;
 
-import cn.nukkit.scheduler.AsyncTask;
+import cn.nukkit.scheduler.Task;
+import lombok.AllArgsConstructor;
 import me.iwareq.scoreboard.Scoreboard;
 
-public class ScoreboardUpdater extends AsyncTask {
+@AllArgsConstructor
+public class ScoreboardUpdater extends Task {
 
 	private final Scoreboard scoreboard;
 
-	private int time;
-
-	public ScoreboardUpdater(Scoreboard scoreboard) {
-		this.scoreboard = scoreboard;
-		this.time = scoreboard.getUpdateTime();
-	}
-
 	@Override
-	public void onRun() {
-		this.time--;
-		if (this.time <= 0) {
-			scoreboard.refresh();
-
-			this.time = scoreboard.getUpdateTime();
-		}
+	public void onRun(int currentTick) {
+		this.scoreboard.refresh();
 	}
 }