From 9ac7d48760fd61adbdc0dbc3219c797c21555adb Mon Sep 17 00:00:00 2001
From: Len <40720638+destro174@users.noreply.github.com>
Date: Sat, 8 Jul 2023 22:13:24 +0200
Subject: [PATCH] Remove teams and start making use of the AFK API in Galaxy

---
 gradlew                                       |  0
 .../com/alttd/afkdectector/AFKCheckTimer.java |  2 --
 .../com/alttd/afkdectector/AFKDetector.java   | 19 -------------------
 .../afkdectector/afkplayer/AFKPlayer.java     | 16 +++++++---------
 4 files changed, 7 insertions(+), 30 deletions(-)
 mode change 100644 => 100755 gradlew

diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
diff --git a/src/main/java/com/alttd/afkdectector/AFKCheckTimer.java b/src/main/java/com/alttd/afkdectector/AFKCheckTimer.java
index 8f95259..231cd80 100755
--- a/src/main/java/com/alttd/afkdectector/AFKCheckTimer.java
+++ b/src/main/java/com/alttd/afkdectector/AFKCheckTimer.java
@@ -66,7 +66,6 @@ public class AFKCheckTimer extends BukkitRunnable {
         afkPlayer.setPlayerToSphereCenter(pastLocation);
         afkPlayer.setStandingTime(System.currentTimeMillis());
         player.setSleepingIgnored(false);
-        plugin.AFKPlayers.removeEntry(player.getName());
         afkPlayer.ResetAFK();
 
         MessageTimer currentTimer = plugin.messageTimers.get(player.getUniqueId());
@@ -79,7 +78,6 @@ public class AFKCheckTimer extends BukkitRunnable {
         afkPlayer.setAFK(true);
         player.setSleepingIgnored(true);
         //player.setCanPickupItems(false);
-        plugin.AFKPlayers.addEntry(player.getName());
         if (Config.AFK_TOGGLE_MESSAGES) {
             TagResolver placeholders = TagResolver.resolver(
                     Placeholder.parsed("player", player.getName())
diff --git a/src/main/java/com/alttd/afkdectector/AFKDetector.java b/src/main/java/com/alttd/afkdectector/AFKDetector.java
index c4cb014..9daa3a3 100755
--- a/src/main/java/com/alttd/afkdectector/AFKDetector.java
+++ b/src/main/java/com/alttd/afkdectector/AFKDetector.java
@@ -46,10 +46,6 @@ public class AFKDetector extends JavaPlugin implements Listener {
     public boolean fullOverride;
 
     public static MiniMessage miniMessage;
-    /**
-     * AFK players need to be added to a team.
-     */
-    Team AFKPlayers;
 
     @Override
     public void onEnable() {
@@ -57,7 +53,6 @@ public class AFKDetector extends JavaPlugin implements Listener {
             instance = this;
             miniMessage = MiniMessage.miniMessage();
             loadConfig(null);
-            setupAFKStats();
             getServer().getPluginManager().registerEvents(this, this);
             //getCommand("afk").setExecutor(new AFKCommand(this));
             getCommand("afklist").setExecutor(new AFKListCommand(this));
@@ -88,20 +83,6 @@ public class AFKDetector extends JavaPlugin implements Listener {
         return players.get(player.getUniqueId());
     }
 
-    private void setupAFKStats() {
-        if (Bukkit.getScoreboardManager().getMainScoreboard().getTeam("AFKPlayers") == null) {
-            AFKPlayers = Bukkit.getScoreboardManager().getMainScoreboard().registerNewTeam("AFKPlayers");
-        } else {
-            AFKPlayers = Bukkit.getScoreboardManager().getMainScoreboard().getTeam("AFKPlayers");
-        }
-        if (AFKPlayers == null) {
-            Logger.warn("Could not find scoreboard AFKPlayers");
-            return;
-        }
-        AFKPlayers.setOption(Team.Option.COLLISION_RULE, Team.OptionStatus.NEVER);
-        //AFKPlayers.setOption(Team.Option.NAME_TAG_VISIBILITY, Team.OptionStatus.NEVER);
-    }
-
     /**
      * Get the afk time for a player
      */
diff --git a/src/main/java/com/alttd/afkdectector/afkplayer/AFKPlayer.java b/src/main/java/com/alttd/afkdectector/afkplayer/AFKPlayer.java
index 020f9e0..1edc430 100755
--- a/src/main/java/com/alttd/afkdectector/afkplayer/AFKPlayer.java
+++ b/src/main/java/com/alttd/afkdectector/afkplayer/AFKPlayer.java
@@ -14,16 +14,14 @@ import java.util.UUID;
 
 public class AFKPlayer {
 
-    private final String playerName;
-    private final UUID uuid;
+    private final Player player;
     private Location playerToSphereCenter;
     private long standingTime;
     private final int afkTime;
     private boolean isAFK;
 
     public AFKPlayer(Player player, AFKDetector plugin) {
-        this.playerName = player.getName();
-        this.uuid = player.getUniqueId();
+        this.player = player;
         this.playerToSphereCenter = player.getLocation();
         this.standingTime = System.currentTimeMillis();
         this.afkTime = plugin.getAllowedAFKTime(player);
@@ -31,11 +29,11 @@ public class AFKPlayer {
     }
 
     public String getPlayerName() {
-        return this.playerName;
+        return this.player.getName();
     }
 
     public UUID getPlayerUuid() {
-        return this.uuid;
+        return this.player.getUniqueId();
     }
 
     public Location getPlayerToSphereCenter() {
@@ -68,6 +66,7 @@ public class AFKPlayer {
 
     public void setAFK(boolean bool) {
         isAFK = bool;
+        player.setAfk(bool);
     }
 
     public boolean isAFK() {
@@ -77,15 +76,14 @@ public class AFKPlayer {
     public void ResetAFK() {
         if (isAFK && Config.AFK_TOGGLE_MESSAGES) {
             TagResolver placeholders = TagResolver.resolver(
-                    Placeholder.parsed("player", playerName)
+                    Placeholder.parsed("player", getPlayerName())
             );
             Component component = AFKDetector.miniMessage.deserialize(Messages.AFK_TOGGLE_OFF.getMessage(), placeholders);
             Bukkit.broadcast(component, "afkdetector.notify");
         }
         standingTime = System.currentTimeMillis();
-        Player player = Bukkit.getPlayer(getPlayerUuid());
         playerToSphereCenter = (player == null) ? null : player.getLocation();
-        isAFK = false;
+        setAFK(false);
     }
 
 }