Respect AFK players marked by the Detect AFK Players datapack

Author: SuperDyl

README.md

@@ -30,13 +30,27 @@ Just like the Vanilla Tweaks version,
 this pack also doesn't allow players to tag AFK players,
 if a player is marked AFK by the Vanilla Tweaks AFK Display pack.
 
+## Detect AFK Players Compatible
+
+This pack will not allow players to tag AFK players
+from the Detect AFK Players datapack.
+It should treat these players the same it treats players marked
+AFK by the Vanilla Tweaks AFK Display datapack.
+
 ## Usage Guide
 
 To add someone to the tagger's team and give them a tag,
 an admin can use the command `/execute as <playername> run function tag:become_tagger`
 
+To make someone no longer a tagger (and take away their tag),
+an admin can use the command `/execute as <playername> run function tag:become_normal`
+
 An admin can create a new tag at anytime by using the command `function tag:spawn_tag`
 
+As long as a player is a tagger, they will have a red name.
+This only works if the player isn't on another team.
+Every 5 seconds, the game will give all taggers who aren't on a team back their red name.
+
 The pack keeps track of how many times each player has been tagged.
 An admin can display it under player names with the command
 `/scoreboard objectives setdisplay below_name tg_timesTagged`
@@ -91,6 +105,8 @@ I felt were issues with the original pack.
   * To make a player no longer a tagger, use `/execute as <player> run function tag:become_normal`
   * If a tagger has no team, they are occasionally added back to the `tg_tagged` team (to give them the red name)
 * Uninstall command attempts to remove tag game tags from players (for players who are online)
+* Added support for the Detect AFK Players datapack
+  * Players marked AFK by this datapack also cannot be tagged
 
 ## Issues
 

data/tag/function/check_tag.mcfunction

@@ -7,13 +7,14 @@ execute on attacker if entity @s[tag=tm_tg_tagged] run tag @s add tg_tagger
 tag @s add tg_tagged
 
 # if done with cooldown AND tagged player isn't afk
-execute if entity @s[team=!afkDis.afk] if entity @p[tag=tg_tagger,scores={tg_tagCooldown=0}] run function tag:swap_tagger
+execute if entity @s[team=!afkDis.afk,tag=!afk] if entity @p[tag=tg_tagger,scores={tg_tagCooldown=0}] run function tag:swap_tagger
 
 # else still on cooldown AND tagged player isn't afk
-execute if entity @s[team=!afkDis.afk] unless entity @p[tag=tg_tagger,scores={tg_tagCooldown=0}] as @a[tag=tg_tagger] run function tag:cooldown_message
+execute if entity @s[team=!afkDis.afk,tag=!afk] unless entity @p[tag=tg_tagger,scores={tg_tagCooldown=0}] as @a[tag=tg_tagger] run function tag:cooldown_message
 
 # Tell off other player for hitting an afk player
 execute if entity @s[team=afkDis.afk] on attacker run tellraw @s [{"color":"red","text":"You cannot tag an AFK player!"}]
+execute if entity @s[tag=afk] on attacker run tellraw @s [{"color":"red","text":"You cannot tag an AFK player!"}]
 
 # cleanup
 tag @s remove tg_tagged