Change AFK to have meta

Author: aakatz3

build.gradle

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "com.dumbdogdiner"
-version = "3.1.2"
+version = "3.1.3"
 
 repositories {
     mavenCentral()

src/main/java/com/dumbdogdiner/stickycommands/User.java

@@ -8,6 +8,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
+import org.bukkit.metadata.FixedMetadataValue;
 import org.jetbrains.annotations.NotNull;
 
 import lombok.Getter;
@@ -31,14 +32,29 @@ public class User implements Cacheable {
 
     /**
      * Whether or not this user is AFK.
+     * We need a CUSTOM setter.
      */
     @Getter
-    @Setter
-    private boolean afk;
+    private boolean afk = false;
 
     @Getter
-    @Setter
     private Integer afkTime = 0;
+
+    public boolean setAfk(boolean AFKState){
+        if(!AFKState)
+            afkTime = 0;
+        afk = AFKState;
+        if(afk){
+            getPlayer().setMetadata("AFK", new FixedMetadataValue(StickyCommands.getInstance(), "AFK"));
+        } else {
+            getPlayer().removeMetadata("AFK", StickyCommands.getInstance());
+        }
+        return afk;
+    }
+
+    public int incAfkTime(){
+        return ++afkTime;
+    }
 
    // I spent an hour trying to come up with a good solution to this weird problem where if you are being pushed by water, and on the corner water block, your from block is considered air and not water...
    // So, we need to keep a buffer of the last 3 blocks the player stood in, and if it contains water, we'll consider it as the water pushing them, since there's no event for

src/main/java/com/dumbdogdiner/stickycommands/commands/Afk.java

@@ -36,7 +36,6 @@ public ExitCode executeCommand(CommandSender sender, String commandLabel, String
 
         if (user.isAfk()) {
             user.setAfk(false);
-            user.setAfkTime(0);
             for (Player p : Bukkit.getOnlinePlayers()) {
                 p.sendMessage(StickyCommands.getInstance().getLocaleProvider().translate("afk.not-afk", variables));
             }

src/main/java/com/dumbdogdiner/stickycommands/listeners/AfkEventListener.java

@@ -89,7 +89,6 @@ private void checkAfk(Player player, PlayerEvent event) {
             StickyCommands.getInstance().getOnlineUserCache().put(player.getUniqueId(), User.fromPlayer(player));
 
         assert user != null;
-        user.setAfkTime(0);
         if (user.isAfk()) {
             variables.put("player", player.getName());
             // Reset their AFK time

src/main/java/com/dumbdogdiner/stickycommands/listeners/PlayerInteractionListener.java

@@ -15,10 +15,11 @@ public void onInteract(PlayerInteractEvent event) {
         var player = event.getPlayer();
         var is = player.getInventory().getItemInMainHand();
         var meta = is.getItemMeta();
-        if (is.getType() == Material.AIR || is.getType() == null)
+        if (is.getType() == Material.AIR)
             return;
-        if (meta.hasLore()) {
+        if (meta != null && meta.hasLore()) {
             List<String> lore = meta.getLore();
+            assert lore != null;
             String[] metaCheck = lore.get(0).split(":");
             if (metaCheck[0].equalsIgnoreCase("command") && metaCheck[1] != null) {
                 if (event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.LEFT_CLICK_BLOCK

src/main/java/com/dumbdogdiner/stickycommands/runnables/AfkTimeRunnable.java

@@ -17,7 +17,7 @@ public class AfkTimeRunnable extends TimerTask {
     @Override
     public void run() {
         for (User user : StickyCommands.getInstance().getOnlineUserCache().values()) {
-            user.setAfkTime(user.getAfkTime() + 1);
+            user.incAfkTime();
             if (user.getAfkTime() >= AFK_TIMEOUT) {
                 var variables = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
                 if (!user.isAfk()) {

src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: StickyCommands
-version: 3.0.1
+version: 3.1.3
 main: com.dumbdogdiner.stickycommands.StickyCommands
 load: STARTUP
 authors: