fix: tweak afk handling

MineInAbyss · Dec 11, 2023 · 25d0b85 · 25d0b85
1 parent a351ad8
commit 25d0b85
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 14 deletions.
diff --git a/src/main/kotlin/com/mineinabyss/extracommands/ExtraCommands.kt b/src/main/kotlin/com/mineinabyss/extracommands/ExtraCommands.kt
@@ -1,6 +1,8 @@
 package com.mineinabyss.extracommands
 
+import com.mineinabyss.extracommands.listeners.AfkListener
 import com.mineinabyss.idofront.di.DI
+import com.mineinabyss.idofront.plugin.listeners
 import org.bukkit.plugin.java.JavaPlugin
 
 class ExtraCommands : JavaPlugin() {
@@ -9,6 +11,10 @@ class ExtraCommands : JavaPlugin() {
         createExtraCommandsContext()
         ExtraCommandExecutor()
 
+        listeners(
+            AfkListener()
+        )
+
         ExtraPlaceholders().register()
     }
 

diff --git a/src/main/kotlin/com/mineinabyss/extracommands/ExtraPlaceholders.kt b/src/main/kotlin/com/mineinabyss/extracommands/ExtraPlaceholders.kt
@@ -1,7 +1,6 @@
 package com.mineinabyss.extracommands
 
-import com.mineinabyss.extracommands.commands.AfkPlayer
-import com.mineinabyss.geary.papermc.tracking.entities.toGeary
+import com.mineinabyss.extracommands.commands.afkPlayers
 import me.clip.placeholderapi.expansion.PlaceholderExpansion
 import org.bukkit.entity.Player
 import kotlin.time.toKotlinDuration
@@ -16,7 +15,7 @@ class ExtraPlaceholders : PlaceholderExpansion() {
 
     override fun onPlaceholderRequest(player: Player, identifier: String) =
         when (identifier) {
-            "afk" -> extraCommands.config.afk.takeIf { afk -> player.idleDuration.toKotlinDuration() >= afk.idleTime || player.toGeary().has<AfkPlayer>() }?.text ?: ""
+            "afk" -> extraCommands.config.afk.takeIf { afk -> player.idleDuration.toKotlinDuration() >= afk.idleTime || player.uniqueId  in afkPlayers }?.text ?: ""
             else -> null
         }
 }
diff --git a/src/main/kotlin/com/mineinabyss/extracommands/commands/AfkCommand.kt b/src/main/kotlin/com/mineinabyss/extracommands/commands/AfkCommand.kt
@@ -1,21 +1,21 @@
 package com.mineinabyss.extracommands.commands
 
-import com.mineinabyss.geary.papermc.tracking.entities.toGeary
-import com.mineinabyss.idofront.commands.arguments.enumArg
 import com.mineinabyss.idofront.commands.entrypoint.CommandDSLEntrypoint
 import com.mineinabyss.idofront.commands.extensions.actions.playerAction
 import com.mineinabyss.idofront.messaging.info
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import org.bukkit.GameMode
 import org.bukkit.entity.Player
+import java.util.*
 
-@Serializable @SerialName("extracommands:afk") class AfkPlayer
-
-fun Player.toggleAfk() = toGeary().let {
-    if (it.has<AfkPlayer>()) it.remove<AfkPlayer>()
-    else it.set(AfkPlayer())
-    it.has<AfkPlayer>()
+val afkPlayers = mutableSetOf<UUID>()
+fun Player.toggleAfk() = when (uniqueId in afkPlayers) {
+    true -> {
+        afkPlayers -= uniqueId
+        false
+    }
+    false -> {
+        afkPlayers += uniqueId
+        true
+    }
 }
 
 fun CommandDSLEntrypoint.afkCommand() {

diff --git a/src/main/kotlin/com/mineinabyss/extracommands/listeners/AfkListener.kt b/src/main/kotlin/com/mineinabyss/extracommands/listeners/AfkListener.kt
@@ -0,0 +1,29 @@
+package com.mineinabyss.extracommands.listeners
+
+import com.mineinabyss.extracommands.commands.afkPlayers
+import com.mineinabyss.idofront.messaging.info
+import io.papermc.paper.event.player.AsyncChatEvent
+import org.bukkit.event.EventHandler
+import org.bukkit.event.Listener
+import org.bukkit.event.player.PlayerMoveEvent
+import org.bukkit.event.player.PlayerQuitEvent
+
+class AfkListener : Listener {
+
+    @EventHandler
+    fun PlayerMoveEvent.onMove() {
+        if (hasChangedPosition() && afkPlayers.remove(player.uniqueId))
+            player.info("<gray>You are no longer AFK")
+    }
+
+    @EventHandler
+    fun PlayerQuitEvent.onQuit() {
+        afkPlayers.remove(player.uniqueId)
+    }
+
+    @EventHandler
+    fun AsyncChatEvent.onChat() {
+        if (afkPlayers.remove(player.uniqueId))
+            player.info("<gray>You are no longer AFK")
+    }
+}