Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Removed Old PlayerSession Functions (#5404)

Browse Source 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Acruid
2021-11-22 23:11:48 -08:00
committed by GitHub
parent 7910928679
commit 6e54e740c7
26 changed files with 97 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
View File

@@ -1,4 +1,4 @@
using System.Linq;
using System.Linq;
using System.Threading.Tasks;
using Content.Server.Buckle.Components;
using Content.Server.Hands.Components;
@@ -98,7 +98,7 @@ namespace Content.IntegrationTests.Tests.Buckle
Assert.NotNull(buckle.BuckledTo);
Assert.True(buckle.Buckled);
var player = IoCManager.Resolve<IPlayerManager>().GetAllPlayers().Single();
var player = IoCManager.Resolve<IPlayerManager>().Sessions.Single();
Assert.True(((BuckleComponentState) buckle.GetComponentState(player)).Buckled);
Assert.False(actionBlocker.CanMove(human.Uid));
Assert.False(actionBlocker.CanChangeDirection(human.Uid));

5
Content.IntegrationTests/Tests/Commands/PardonCommand.cs
View File

@@ -1,4 +1,5 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Content.Server.Database;
@@ -27,7 +28,7 @@ namespace Content.IntegrationTests.Tests.Commands
await server.WaitAssertion(async () =>
{
var clientSession = sPlayerManager.GetAllPlayers().Single();
var clientSession = sPlayerManager.Sessions.Single();
var clientId = clientSession.UserId;
// No bans on record

5
Content.IntegrationTests/Tests/ContainerOcclusionTest.cs
View File

@@ -59,10 +59,7 @@ namespace Content.IntegrationTests.Tests
s.Post(() =>
{
IoCManager.Resolve<IPlayerManager>()
.GetAllPlayers()
.Single()
.JoinGame();
IoCManager.Resolve<IPlayerManager>().ServerSessions.Single().JoinGame();
var mapMan = IoCManager.Resolve<IMapManager>();

8
Content.IntegrationTests/Tests/GameObjects/Components/Mobs/ActionsComponentTests.cs
View File

@@ -70,8 +70,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
await server.WaitAssertion(() =>
{
var player = serverPlayerManager.GetAllPlayers().Single();
var playerEnt = player.AttachedEntity;
var playerEnt = serverPlayerManager.Sessions.Single().AttachedEntity;
var actionsComponent = playerEnt!.GetComponent<ServerActionsComponent>();
// player should begin with their innate actions granted
@@ -153,8 +152,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
// now revoke the action and check that the client sees it as revoked
await server.WaitAssertion(() =>
{
var player = serverPlayerManager.GetAllPlayers().Single();
var playerEnt = player.AttachedEntity;
var playerEnt = serverPlayerManager.Sessions.Single().AttachedEntity;
var actionsComponent = playerEnt!.GetComponent<ServerActionsComponent>();
actionsComponent.Revoke(ActionType.DebugInstant);
});
@@ -246,7 +244,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
await server.WaitAssertion(() =>
{
serverPlayerEnt = serverPlayerManager.GetAllPlayers().Single().AttachedEntity;
serverPlayerEnt = serverPlayerManager.Sessions.Single().AttachedEntity;
serverActionsComponent = serverPlayerEnt!.GetComponent<ServerActionsComponent>();
// spawn and give them an item that has actions

9
Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs
View File

@@ -2,12 +2,11 @@ using System.Linq;
using System.Threading.Tasks;
using Content.Client.Alerts;
using Content.Client.Alerts.UI;
using Content.Client.UserInterface;
using Content.Server.Alert;
using Content.Shared.Alert;
using NUnit.Framework;
using Robust.Client.UserInterface;
using IPlayerManager = Robust.Server.Player.IPlayerManager;
using Robust.Server.Player;
namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
{
@@ -28,8 +27,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
await server.WaitAssertion(() =>
{
var player = serverPlayerManager.GetAllPlayers().Single();
var playerEnt = player.AttachedEntity;
var playerEnt = serverPlayerManager.Sessions.Single().AttachedEntity;
Assert.NotNull(playerEnt);
var alertsComponent = playerEnt.GetComponent<ServerAlertsComponent>();
Assert.NotNull(alertsComponent);
@@ -69,8 +67,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
await server.WaitAssertion(() =>
{
var player = serverPlayerManager.GetAllPlayers().Single();
var playerEnt = player.AttachedEntity;
var playerEnt = serverPlayerManager.Sessions.Single().AttachedEntity;
Assert.NotNull(playerEnt);
var alertsComponent = playerEnt.GetComponent<ServerAlertsComponent>();
Assert.NotNull(alertsComponent);

9
Content.IntegrationTests/Tests/MindEntityDeletionTest.cs
View File

@@ -1,7 +1,6 @@
using System.Linq;
using System.Linq;
using System.Threading.Tasks;
using Content.Server.Mind;
using Content.Server.Players;
using Content.Shared.Coordinates;
using NUnit.Framework;
using Robust.Server.GameObjects;
@@ -26,7 +25,7 @@ namespace Content.IntegrationTests.Tests
Mind mind = null;
server.Assert(() =>
{
var player = IoCManager.Resolve<IPlayerManager>().GetAllPlayers().Single();
var player = IoCManager.Resolve<IPlayerManager>().ServerSessions.Single();
var mapMan = IoCManager.Resolve<IMapManager>();
var entMgr = IoCManager.Resolve<IServerEntityManager>();
@@ -71,7 +70,7 @@ namespace Content.IntegrationTests.Tests
Mind mind = null;
server.Assert(() =>
{
var player = IoCManager.Resolve<IPlayerManager>().GetAllPlayers().Single();
var player = IoCManager.Resolve<IPlayerManager>().ServerSessions.Single();
var mapMan = IoCManager.Resolve<IMapManager>();
var entMgr = IoCManager.Resolve<IServerEntityManager>();
@@ -116,7 +115,7 @@ namespace Content.IntegrationTests.Tests
MapId map = default;
server.Assert(() =>
{
var player = IoCManager.Resolve<IPlayerManager>().GetAllPlayers().Single();
var player = IoCManager.Resolve<IPlayerManager>().ServerSessions.Single();
var mapMan = IoCManager.Resolve<IMapManager>();

2
Content.IntegrationTests/Tests/Networking/ConnectTest.cs
View File

@@ -50,7 +50,7 @@ namespace Content.IntegrationTests.Tests.Networking
var playerManager = server.ResolveDependency<IPlayerManager>();
Assert.That(playerManager.PlayerCount, Is.EqualTo(1));
Assert.That(playerManager.GetAllPlayers().First().Status, Is.EqualTo(SessionStatus.InGame));
Assert.That(playerManager.Sessions.First().Status, Is.EqualTo(SessionStatus.InGame));
var clEntityManager = client.ResolveDependency<IEntityManager>();
var svEntityManager = server.ResolveDependency<IEntityManager>();

2
Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs
View File

@@ -90,7 +90,7 @@ namespace Content.IntegrationTests.Tests.Networking
{
// Spawn dummy component entity.
var map = sMapManager.CreateMap();
var player = sPlayerManager.GetAllPlayers().Single();
var player = sPlayerManager.ServerSessions.Single();
serverEnt = sEntityManager.SpawnEntity(null, new MapCoordinates((0, 0), map));
serverComponent = serverEnt.AddComponent<PredictionTestComponent>();

4
Content.IntegrationTests/Tests/PDA/PDAExtensionsTests.cs
View File

@@ -1,4 +1,4 @@
using System.Linq;
using System.Linq;
using System.Threading.Tasks;
using Content.Server.Access.Components;
using Content.Server.Hands.Components;
@@ -59,7 +59,7 @@ namespace Content.IntegrationTests.Tests.PDA
await server.WaitAssertion(() =>
{
var player = sPlayerManager.GetAllPlayers().Single().AttachedEntity;
var player = sPlayerManager.Sessions.Single().AttachedEntity;
Assert.NotNull(player);