AfkTimeout: fix /afk command

Flectone · Nov 6, 2023 · b42f030 · b42f030
1 parent 27dcc93
commit b42f030
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/src/main/java/net/flectone/chat/module/commands/CommandAfk.java b/src/main/java/net/flectone/chat/module/commands/CommandAfk.java
@@ -1,8 +1,10 @@
 package net.flectone.chat.module.commands;
 
-import net.flectone.chat.module.FCommand;
+import net.flectone.chat.FlectoneChat;
 import net.flectone.chat.model.player.FPlayer;
+import net.flectone.chat.module.FCommand;
 import net.flectone.chat.module.FModule;
+import net.flectone.chat.module.player.afkTimeout.AfkTimeoutModule;
 import net.flectone.chat.util.MessageUtil;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -48,6 +50,12 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
 
         boolean isAfk = !fPlayer.isAfk();
 
+        FModule fModule = FlectoneChat.getModuleManager().get(AfkTimeoutModule.class);
+        if (fModule instanceof AfkTimeoutModule afkTimeoutModule) {
+            afkTimeoutModule.setAfk(player, isAfk, "/afk");
+            return true;
+        }
+
         String afkSuffix = isAfk
                 ? locale.getVaultString(player, "commands.afk.suffix")
                 : "";

diff --git a/src/main/java/net/flectone/chat/module/player/afkTimeout/AfkTimeoutListener.java b/src/main/java/net/flectone/chat/module/player/afkTimeout/AfkTimeoutListener.java
@@ -27,6 +27,7 @@ public void playerChatEvent(@NotNull AsyncPlayerChatEvent event) {
 
     @EventHandler
     public void playerCommandSendEvent(@NotNull PlayerCommandPreprocessEvent event) {
+        if (event.getMessage().contains("/afk")) return;
         ((AfkTimeoutModule) getModule()).setAfk(event.getPlayer(), false, "commands");
     }
 

diff --git a/src/main/java/net/flectone/chat/module/player/afkTimeout/AfkTimeoutModule.java b/src/main/java/net/flectone/chat/module/player/afkTimeout/AfkTimeoutModule.java
@@ -42,6 +42,9 @@ public void setAfk(@NotNull Player player, boolean isAfk, @NotNull String takeOu
             if (!list.contains(takeOutAction)) return;
 
             LAST_BLOCK_MAP.put(player.getUniqueId(), null);
+        } else {
+
+            LAST_BLOCK_MAP.put(player.getUniqueId(), new Pair<>(TimeUtil.getCurrentTime(), player.getLocation().getBlock()));
         }
 
         FPlayer fPlayer = FPlayerManager.get(player);
@@ -56,12 +59,11 @@ public void setAfk(@NotNull Player player, boolean isAfk, @NotNull String takeOu
 
         String afkMessage = locale.getVaultString(player, "commands.afk." + isAfk + "-message");
         player.sendMessage(MessageUtil.formatAll(player, MessageUtil.formatPlayerString(player, afkMessage)));
+
+        fPlayer.playSound(player, player, this.toString());
     }
 
     public void checkAfk(@NotNull Player player) {
-        if (!isEnabledFor(player)) return;
-        if (hasNoPermission(player)) return;
-
         FPlayer fPlayer = FPlayerManager.get(player);
         if(fPlayer == null) return;
 

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -176,6 +176,7 @@ default:
       time: 3000
 
       take-out-actions:
+        - /afk
         - commands
         - chat
         - move
@@ -337,6 +338,9 @@ default:
 
           set-cancelled: false
 
+  sounds:
+    enable: true
+
   chat-bubble:
     enable: true
     color: "#999999"