Un-revert IPlayerManager refactor (#21244)

Content.IntegrationTests/Tests/Minds/MindTests.Helpers.cs

@@ -1,14 +1,17 @@
 using System.Linq;
 using Content.IntegrationTests.Pair;
+using Content.Server.Mind;
 using Content.Server.Players;
 using Content.Shared.Ghost;
 using Content.Shared.Mind;
+using Content.Shared.Players;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Network;
+using Robust.Shared.Player;
 
 namespace Content.IntegrationTests.Tests.Minds;
 
@@ -36,7 +39,7 @@ public sealed partial class MindTests
         var playerMan = pair.Server.ResolveDependency<IPlayerManager>();
         var mindSys = entMan.System<SharedMindSystem>();
 
-        var player = playerMan.ServerSessions.Single();
+        var player = playerMan.Sessions.Single();
 
         EntityUid entity = default;
         EntityUid mindId = default!;
@@ -71,7 +74,7 @@ public sealed partial class MindTests
         EntityUid mindId = default!;
         MindComponent mind = default!;
 
-        var player = playerMan.ServerSessions.Single();
+        var player = playerMan.Sessions.Single();
         await pair.Server.WaitAssertion(() =>
         {
             var oldUid = player.AttachedEntity;
@@ -116,20 +119,25 @@ public sealed partial class MindTests
     /// </summary>
     private static (EntityUid Id, MindComponent Comp) GetMind(Pair.TestPair pair)
     {
-        var playerMan = pair.Server.ResolveDependency<IPlayerManager>();
-        var entMan = pair.Server.ResolveDependency<IEntityManager>();
-        var player = playerMan.ServerSessions.SingleOrDefault();
+        var playerMan = pair.Server.PlayerMan;
+        var entMan = pair.Server.EntMan;
+        var player = playerMan.Sessions.SingleOrDefault();
         Assert.That(player, Is.Not.Null);
 
         var mindId = player.ContentData()!.Mind!.Value;
         Assert.That(mindId, Is.Not.EqualTo(default(EntityUid)));
         var mind = entMan.GetComponent<MindComponent>(mindId);
+        ActorComponent actor = default!;
         Assert.Multiple(() =>
         {
+            Assert.That(player, Is.EqualTo(mind.Session), "Player session does not match mind session");
+            Assert.That(entMan.System<MindSystem>().GetMind(player.UserId), Is.EqualTo(mindId));
             Assert.That(player.AttachedEntity, Is.EqualTo(mind.CurrentEntity), "Player is not attached to the mind's current entity.");
             Assert.That(entMan.EntityExists(mind.OwnedEntity), "The mind's current entity does not exist");
             Assert.That(mind.VisitingEntity == null || entMan.EntityExists(mind.VisitingEntity), "The minds visited entity does not exist.");
+            Assert.That(entMan.TryGetComponent(mind.CurrentEntity, out actor));
         });
+        Assert.That(actor.PlayerSession, Is.EqualTo(mind.Session));
 
         return (mindId, mind);
     }
@@ -139,7 +147,7 @@ public sealed partial class MindTests
         var netManager = pair.Client.ResolveDependency<IClientNetManager>();
         var playerMan = pair.Server.ResolveDependency<IPlayerManager>();
         var entMan = pair.Server.ResolveDependency<IEntityManager>();
-        var player = playerMan.ServerSessions.Single();
+        var player = playerMan.Sessions.Single();
         var mindId = player.ContentData()!.Mind!.Value;
         var mind = entMan.GetComponent<MindComponent>(mindId);
 
@@ -161,21 +169,21 @@ public sealed partial class MindTests
     {
         var netManager = pair.Client.ResolveDependency<IClientNetManager>();
         var playerMan = pair.Server.ResolveDependency<IPlayerManager>();
-        Assert.That(!playerMan.ServerSessions.Any());
+        Assert.That(!playerMan.Sessions.Any());
 
         await Task.WhenAll(pair.Client.WaitIdleAsync(), pair.Client.WaitIdleAsync());
         pair.Client.SetConnectTarget(pair.Server);
         await pair.Client.WaitPost(() => netManager.ClientConnect(null!, 0, username));
         await pair.RunTicksSync(5);
 
-        var player = playerMan.ServerSessions.Single();
+        var player = playerMan.Sessions.Single();
         Assert.That(player.Status, Is.EqualTo(SessionStatus.InGame));
     }
 
-    private static async Task<IPlayerSession> DisconnectReconnect(Pair.TestPair pair)
+    private static async Task<ICommonSession> DisconnectReconnect(Pair.TestPair pair)
     {
         var playerMan = pair.Server.ResolveDependency<IPlayerManager>();
-        var player = playerMan.ServerSessions.Single();
+        var player = playerMan.Sessions.Single();
         var name = player.Name;
         var id = player.UserId;
 
@@ -183,7 +191,7 @@ public sealed partial class MindTests
         await Connect(pair, name);
 
         // Session has changed
-        var newSession = playerMan.ServerSessions.Single();
+        var newSession = playerMan.Sessions.Single();
         Assert.Multiple(() =>
         {
             Assert.That(newSession, Is.Not.EqualTo(player));