From 8bf0d16fadc8d2db14c5d43f4973d8ba4431b49d Mon Sep 17 00:00:00 2001
From: Kara <lunarautomaton6@gmail.com>
Date: Wed, 7 Dec 2022 08:07:58 -0600
Subject: [PATCH] Revert "Kicking AFK players (#12812)" (#12909)

This reverts commit ca260ee66663d62e9e4789eff63fbf866b04c5c2.
---
 Content.Server/Afk/AFKSystem.cs    | 25 ++++---------------------
 Content.Shared/CCVar/CCVars.cs     |  6 ------
 Resources/Locale/en-US/afk/afk.ftl |  2 --
 3 files changed, 4 insertions(+), 29 deletions(-)
 delete mode 100644 Resources/Locale/en-US/afk/afk.ftl

diff --git a/Content.Server/Afk/AFKSystem.cs b/Content.Server/Afk/AFKSystem.cs
index 0cfb1997e5..0f2bc52112 100644
--- a/Content.Server/Afk/AFKSystem.cs
+++ b/Content.Server/Afk/AFKSystem.cs
@@ -1,6 +1,5 @@
 using System.Linq;
 using Content.Server.Afk.Events;
-using Content.Server.Chat.Managers;
 using Content.Server.GameTicking;
 using Content.Shared.CCVar;
 using Robust.Server.Player;
@@ -21,20 +20,17 @@ public sealed class AFKSystem : EntitySystem
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly GameTicker _ticker = default!;
-    [Dependency] private readonly IChatManager _chatManager = default!;
 
     private float _checkDelay;
-    private float _kickDelay;
     private TimeSpan _checkTime;
 
-    private readonly Dictionary<IPlayerSession, TimeSpan> _afkPlayers = new();
+    private readonly HashSet<IPlayerSession> _afkPlayers = new();
 
     public override void Initialize()
     {
         base.Initialize();
         _playerManager.PlayerStatusChanged += OnPlayerChange;
         _configManager.OnValueChanged(CCVars.AfkTime, SetAfkDelay, true);
-        _configManager.OnValueChanged(CCVars.AfkKickTime, SetAfkKickDelay, true);
     }
 
     private void SetAfkDelay(float obj)
@@ -42,11 +38,6 @@ public sealed class AFKSystem : EntitySystem
         _checkDelay = obj;
     }
 
-    private void SetAfkKickDelay(float obj)
-    {
-        _kickDelay = obj;
-    }
-
     private void OnPlayerChange(object? sender, SessionStatusEventArgs e)
     {
         switch (e.NewStatus)
@@ -63,7 +54,6 @@ public sealed class AFKSystem : EntitySystem
         _afkPlayers.Clear();
         _playerManager.PlayerStatusChanged -= OnPlayerChange;
         _configManager.UnsubValueChanged(CCVars.AfkTime, SetAfkDelay);
-        _configManager.UnsubValueChanged(CCVars.AfkKickTime, SetAfkKickDelay);
     }
 
     public override void Update(float frameTime)
@@ -88,25 +78,18 @@ public sealed class AFKSystem : EntitySystem
             var pSession = (IPlayerSession) session;
             var isAfk = _afkManager.IsAfk(pSession);
 
-            if (isAfk && _afkPlayers.TryAdd(pSession, _timing.CurTime))
+            if (isAfk && _afkPlayers.Add(pSession))
             {
                 var ev = new AFKEvent(pSession);
                 RaiseLocalEvent(ref ev);
-                
-                _chatManager.DispatchServerMessage(pSession, Loc.GetString("afk-system-kick-warning"));
+                continue;
             }
 
             if (!isAfk && _afkPlayers.Remove(pSession))
             {
                 var ev = new UnAFKEvent(pSession);
                 RaiseLocalEvent(ref ev);
-            }
-
-            if (isAfk &&
-                _afkPlayers.TryGetValue(pSession, out var startAfkTime) &&
-                _timing.CurTime - startAfkTime >= TimeSpan.FromSeconds(_kickDelay))
-            {
-                pSession.ConnectedClient.Disconnect( Loc.GetString("afk-system-kick-reason"));
+                continue;
             }
         }
     }
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index c721685e11..430abca3c5 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -1161,12 +1161,6 @@ namespace Content.Shared.CCVar
         public static readonly CVarDef<float> AfkTime =
             CVarDef.Create("afk.time", 60f, CVar.SERVERONLY);
 
-        /// <summary>
-        /// How long seconds a client can go after being detected as AFK before being kicked.
-        /// </summary>
-        public static readonly CVarDef<float> AfkKickTime =
-            CVarDef.Create("afk.kick_time", 600f, CVar.SERVERONLY);
-
         /*
          * IC
          */
diff --git a/Resources/Locale/en-US/afk/afk.ftl b/Resources/Locale/en-US/afk/afk.ftl
deleted file mode 100644
index 6401ddba5c..0000000000
--- a/Resources/Locale/en-US/afk/afk.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-afk-system-kick-warning = You will be kicked for being AFK soon!
-afk-system-kick-reason = You were kicked for being AFK!