From 27d75fcfa3009b2437eae50358a7fdd9a189459c Mon Sep 17 00:00:00 2001
From: Len <40720638+destro174@users.noreply.github.com>
Date: Sun, 9 Jul 2023 00:52:32 +0200
Subject: [PATCH] Fix some merge issues

---
 src/main/java/com/alttd/afkdectector/AFKCheckTimer.java   | 2 +-
 src/main/java/com/alttd/afkdectector/AFKDetector.java     | 8 ++------
 .../java/com/alttd/afkdectector/afkplayer/AFKPlayer.java  | 6 +-----
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/alttd/afkdectector/AFKCheckTimer.java b/src/main/java/com/alttd/afkdectector/AFKCheckTimer.java
index 152b564..7def630 100755
--- a/src/main/java/com/alttd/afkdectector/AFKCheckTimer.java
+++ b/src/main/java/com/alttd/afkdectector/AFKCheckTimer.java
@@ -88,7 +88,7 @@ public class AFKCheckTimer extends BukkitRunnable {
         afkPlayer.setPlayerToSphereCenter(pastLocation);
         afkPlayer.setStandingTime(System.currentTimeMillis());
         player.setSleepingIgnored(false);
-        afkPlayer.ResetAFK();
+        afkPlayer.resetAFK();
 
         MessageTimer currentTimer = plugin.messageTimers.get(player.getUniqueId());
         if (currentTimer != null) {
diff --git a/src/main/java/com/alttd/afkdectector/AFKDetector.java b/src/main/java/com/alttd/afkdectector/AFKDetector.java
index b6adc6e..335054c 100755
--- a/src/main/java/com/alttd/afkdectector/AFKDetector.java
+++ b/src/main/java/com/alttd/afkdectector/AFKDetector.java
@@ -28,7 +28,6 @@ import org.bukkit.permissions.PermissionAttachmentInfo;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scoreboard.Scoreboard;
 import org.bukkit.scoreboard.ScoreboardManager;
-import org.bukkit.scoreboard.Team;
 
 import java.util.Date;
 import java.util.HashMap;
@@ -70,9 +69,6 @@ public class AFKDetector extends JavaPlugin implements Listener {
 
     @Override
     public void onDisable() {
-        ScoreboardManager manager = Bukkit.getScoreboardManager();
-        Scoreboard board = manager.getMainScoreboard();
-        board.getTeam("AFKPlayers").unregister();
         this.getServer().getScheduler().cancelTasks(this);
     }
 
@@ -155,7 +151,7 @@ public class AFKDetector extends JavaPlugin implements Listener {
         }
 
         Player player = event.getPlayer();
-        getPlayer(player).resetAFK(player);
+        getPlayer(player).resetAFK();
         messageHistory.addEntry(uuid, message);
     }
 
@@ -175,7 +171,7 @@ public class AFKDetector extends JavaPlugin implements Listener {
         }
 
         Player player = event.getPlayer();
-        getPlayer(player).resetAFK(player);
+        getPlayer(player).resetAFK();
         commandHistory.addEntry(uuid, command);
     }
 
diff --git a/src/main/java/com/alttd/afkdectector/afkplayer/AFKPlayer.java b/src/main/java/com/alttd/afkdectector/afkplayer/AFKPlayer.java
index 147a496..3139832 100755
--- a/src/main/java/com/alttd/afkdectector/afkplayer/AFKPlayer.java
+++ b/src/main/java/com/alttd/afkdectector/afkplayer/AFKPlayer.java
@@ -83,11 +83,7 @@ public class AFKPlayer {
         player.setAfk(bool);
     }
 
-    public boolean isAFK() {
-        return isAFK;
-    }
-
-    public void ResetAFK() {
+    public void resetAFK() {
         if (isAFK && Config.AFK_TOGGLE_MESSAGES) {
             TagResolver placeholders = TagResolver.resolver(
                     Placeholder.parsed("player", getPlayerName())