Changes required for frozen event bus PR (#23493)

* Changes required for frozen event bus PR

* Fix RoundEndTest

Content.Server/Afk/AFKSystem.cs

@@ -4,6 +4,7 @@ using Content.Shared.CCVar;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
+using Robust.Shared.Input;
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
 
@@ -30,6 +31,13 @@ public sealed class AFKSystem : EntitySystem
         base.Initialize();
         _playerManager.PlayerStatusChanged += OnPlayerChange;
         _configManager.OnValueChanged(CCVars.AfkTime, SetAfkDelay, true);
+
+        SubscribeNetworkEvent<FullInputCmdMessage>(HandleInputCmd);
+    }
+
+    private void HandleInputCmd(FullInputCmdMessage msg, EntitySessionEventArgs args)
+    {
+        _afkManager.PlayerDidAction(args.SenderSession);
     }
 
     private void SetAfkDelay(float obj)

Content.Server/Afk/AfkManager.cs

@@ -33,7 +33,7 @@ namespace Content.Server.Afk
     }
 
     [UsedImplicitly]
-    public sealed class AfkManager : IAfkManager, IEntityEventSubscriber
+    public sealed class AfkManager : IAfkManager
     {
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
@@ -49,11 +49,6 @@ namespace Content.Server.Afk
 
             _playerManager.PlayerStatusChanged += PlayerStatusChanged;
             _consoleHost.AnyCommandExecuted += ConsoleHostOnAnyCommandExecuted;
-
-            _entityManager.EventBus.SubscribeSessionEvent<FullInputCmdMessage>(
-                EventSource.Network,
-                this,
-                HandleInputCmd);
         }
 
         public void PlayerDidAction(ICommonSession player)
@@ -91,10 +86,5 @@ namespace Content.Server.Afk
             if (shell.Player is { } player)
                 PlayerDidAction(player);
         }
-
-        private void HandleInputCmd(FullInputCmdMessage msg, EntitySessionEventArgs args)
-        {
-            PlayerDidAction(args.SenderSession);
-        }
     }
 }