Player: Add afk kick after 15 minutes back in

cmangos · Mar 24, 2024 · 127521b · 127521b
1 parent d23b3b1
commit 127521b
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/src/game/Entities/Player.cpp b/src/game/Entities/Player.cpp
@@ -1988,6 +1988,8 @@ void Player::ToggleAFK()
     // afk player not allowed in battleground
     if (isAFK() && InBattleGround() && !InArena() && !IsGameMaster())
         LeaveBattleground();
+
+    GetSession()->AfkStateChange(isAFK());
 }
 
 void Player::ToggleDND()

diff --git a/src/game/Server/WorldSession.cpp b/src/game/Server/WorldSession.cpp
@@ -96,7 +96,7 @@ bool WorldSessionFilter::Process(WorldPacket const& packet) const
 /// WorldSession constructor
 WorldSession::WorldSession(uint32 id, WorldSocket* sock, AccountTypes sec, uint8 expansion, time_t mute_time, LocaleConstant locale, std::string accountName, uint32 accountFlags, uint32 recruitingFriend, bool isARecruiter) :
     m_muteTime(mute_time), m_GUIDLow(0), _player(nullptr), m_socket(sock ? sock->shared_from_this() : nullptr), _security(sec), _accountId(id), m_expansion(expansion), m_orderCounter(0),
-    m_gameBuild(0), m_clientOS(CLIENT_OS_UNKNOWN), m_clientPlatform(CLIENT_PLATFORM_UNKNOWN), m_accountMaxLevel(0), m_lastAnticheatUpdate(0), m_anticheat(nullptr), _logoutTime(0), m_kickTime(0), m_localAddress("127.0.0.1"),
+    m_gameBuild(0), m_clientOS(CLIENT_OS_UNKNOWN), m_clientPlatform(CLIENT_PLATFORM_UNKNOWN), m_accountMaxLevel(0), m_lastAnticheatUpdate(0), m_anticheat(nullptr), _logoutTime(0), m_afkTime(0), m_kickTime(0), m_localAddress("127.0.0.1"),
     m_inQueue(false), m_playerLoading(false), m_kickSession(false), m_playerLogout(false), m_playerRecentlyLogout(false), m_playerSave(true),
     m_sessionDbcLocale(sWorld.GetAvailableDbcLocale(locale)), m_sessionDbLocaleIndex(sObjectMgr.GetStorageLocaleIndexFor(locale)),
     m_latency(0), m_clientTimeDelay(0), m_tutorialState(TUTORIALDATA_UNCHANGED), m_sessionState(WORLD_SESSION_STATE_CREATED),
@@ -530,8 +530,12 @@ bool WorldSession::Update(uint32 /*diff*/)
                 // give the opportunity for this player to reconnect within 20 sec
                 SetOffline();
             }
-            else if (ShouldLogOut(time(nullptr)) && !m_playerLoading)   // check if delayed logout is fired
-                LogoutPlayer();
+            else if (!m_playerLoading)
+            {
+                time_t curTime = time(nullptr);
+                if (ShouldAfkDisconnect(curTime) || ShouldLogOut(curTime)) // check if delayed logout or afk is fired
+                    LogoutPlayer();
+            }
 
             return true;
         }
@@ -775,6 +779,7 @@ void WorldSession::LogoutPlayer()
     SetInCharSelection();
 
     _logoutTime = 0;
+    m_afkTime = 0;
 
     if (m_kickSession)
     {
@@ -1294,6 +1299,14 @@ void WorldSession::SetNoAnticheat()
 
 #endif
 
+void WorldSession::AfkStateChange(bool state)
+{
+    if (state)
+        m_afkTime = time(nullptr);
+    else
+        m_afkTime = 0;
+}
+
 void WorldSession::HandleWardenDataOpcode(WorldPacket& recv_data)
 {
     m_anticheat->WardenPacket(recv_data);

diff --git a/src/game/Server/WorldSession.h b/src/game/Server/WorldSession.h
@@ -334,6 +334,8 @@ class WorldSession
             m_kickSession = kickSession;
         }
 
+        void AfkStateChange(bool state);
+
         /// Is logout cooldown expired?
         bool ShouldLogOut(time_t currTime) const
         {
@@ -345,6 +347,11 @@ class WorldSession
             return (_logoutTime > 0 && currTime >= _logoutTime + 60);
         }
 
+        bool ShouldAfkDisconnect(time_t currTime) const
+        {
+            return (m_afkTime > 0 && currTime >= m_afkTime + 15 * MINUTE);
+        }
+
         void LogoutPlayer();
         void KickPlayer(bool save = false, bool inPlace = false); // inplace variable needed for shutdown
 
@@ -1053,6 +1060,7 @@ class WorldSession
 
         time_t _logoutTime;                                 // when logout will be processed after a logout request
         time_t m_kickTime;
+        time_t m_afkTime;
         bool m_playerSave;                                  // should we have to save the player after logout request
         bool m_inQueue;                                     // session wait in auth.queue
         bool m_playerLoading;                               // code processed in LoginPlayer