Implemented afk check on kick event #705 Note about AFK ignore perm:

- Players kicked by afk that have plan.ignore.afk will be counted as "real" kicks.
plan-player-analytics · Aug 30, 2018 · 333936c · 333936c
1 parent 08d1067
commit 333936c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/Plan/src/main/java/com/djrapitops/plan/system/afk/AFKTracker.java b/Plan/src/main/java/com/djrapitops/plan/system/afk/AFKTracker.java
@@ -65,4 +65,14 @@ public void loggedOut(UUID uuid, long time) {
         lastMovement.remove(uuid);
         usedAFKCommand.remove(uuid);
     }
+
+    public boolean isAfk(UUID uuid) {
+        long time = System.currentTimeMillis();
+
+        Long lastMoved = lastMovement.get(uuid);
+        if (lastMoved == null || lastMoved == -1) {
+            return false;
+        }
+        return time - lastMoved > afkThresholdMs;
+    }
 }
diff --git a/Plan/src/main/java/com/djrapitops/plan/system/listeners/bukkit/PlayerOnlineListener.java b/Plan/src/main/java/com/djrapitops/plan/system/listeners/bukkit/PlayerOnlineListener.java
@@ -63,6 +63,10 @@ public void onPlayerKick(PlayerKickEvent event) {
                 return;
             }
             UUID uuid = event.getPlayer().getUniqueId();
+            if (AFKListener.AFK_TRACKER.isAfk(uuid)) {
+                return;
+            }
+
             Processing.submit(new KickProcessor(uuid));
         } catch (Exception e) {
             Log.toLog(this.getClass(), e);

diff --git a/Plan/src/main/java/com/djrapitops/plan/system/listeners/sponge/SpongePlayerListener.java b/Plan/src/main/java/com/djrapitops/plan/system/listeners/sponge/SpongePlayerListener.java
@@ -2,6 +2,7 @@
 
 import com.djrapitops.plan.data.container.Session;
 import com.djrapitops.plan.system.cache.SessionCache;
+import com.djrapitops.plan.system.listeners.bukkit.AFKListener;
 import com.djrapitops.plan.system.processing.Processing;
 import com.djrapitops.plan.system.processing.processors.info.NetworkPageUpdateProcessor;
 import com.djrapitops.plan.system.processing.processors.info.PlayerPageUpdateProcessor;
@@ -52,6 +53,9 @@ private void actOnLoginEvent(ClientConnectionEvent.Login event) {
     public void onKick(KickPlayerEvent event) {
         try {
             UUID uuid = event.getTargetEntity().getUniqueId();
+            if (AFKListener.AFK_TRACKER.isAfk(uuid)) {
+                return;
+            }
             Processing.submit(new KickProcessor(uuid));
         } catch (Exception e) {
             Log.toLog(this.getClass(), e);