diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs index c7b4ab6ae2..7d8c45e68a 100644 --- a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs +++ b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs @@ -22,6 +22,11 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs var server = pairTracker.Pair.Server; var client = pairTracker.Pair.Client; + var clientPlayerMgr = client.ResolveDependency(); + var clientUIMgr = client.ResolveDependency(); + var clientEntManager = client.ResolveDependency(); + + var entManager = server.ResolveDependency(); var serverPlayerManager = server.ResolveDependency(); var alertsSystem = server.ResolveDependency().GetEntitySystem(); @@ -31,7 +36,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs playerUid = serverPlayerManager.Sessions.Single().AttachedEntity.GetValueOrDefault(); Assert.That(playerUid != default); // Making sure it exists - _ = IoCManager.Resolve().GetComponent(playerUid); + Assert.That(entManager.HasComponent(playerUid)); var alerts = alertsSystem.GetActiveAlerts(playerUid); Assert.IsNotNull(alerts); @@ -48,15 +53,12 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs AlertsUI clientAlertsUI = default; await client.WaitAssertion(() => { - var clientPlayerMgr = IoCManager.Resolve(); - var clientUIMgr = IoCManager.Resolve(); - var local = clientPlayerMgr.LocalPlayer; Assert.NotNull(local); var controlled = local.ControlledEntity; Assert.NotNull(controlled); // Making sure it exists - _ = IoCManager.Resolve().GetComponent(controlled.Value); + Assert.That(clientEntManager.HasComponent(controlled.Value)); // find the alertsui