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

Random spontaneous cleanup PR (#25131)

Browse Source 
* Use new Subs.CVar helper

Removes manual config OnValueChanged calls, removes need to remember to manually unsubscribe.

This both reduces boilerplate and fixes many issues where subscriptions weren't removed on entity system shutdown.

* Fix a bunch of warnings

* More warning fixes

* Use new DateTime serializer to get rid of ISerializationHooks in changelog code.

* Get rid of some more ISerializationHooks for enums

* And a little more

* Apply suggestions from code review

Co-authored-by: 0x6273 <0x40@keemail.me>

---------

Co-authored-by: 0x6273 <0x40@keemail.me>
This commit is contained in:
Pieter-Jan Briers
2024-02-13 22:48:39 +01:00
committed by GitHub
parent d0c174388c
commit 68ce53ae17
210 changed files with 481 additions and 930 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.IntegrationTests/Tests/Actions/ActionsAddedTest.cs
View File

@@ -23,7 +23,7 @@ public sealed class ActionsAddedTest
var client = pair.Client;
var sEntMan = server.ResolveDependency<IEntityManager>();
var cEntMan = client.ResolveDependency<IEntityManager>();
var clientSession = client.ResolveDependency<Robust.Client.Player.IPlayerManager>().LocalPlayer?.Session;
var clientSession = client.Session;
var serverSession = server.ResolveDependency<IPlayerManager>().Sessions.Single();
var sActionSystem = server.System<SharedActionsSystem>();
var cActionSystem = client.System<SharedActionsSystem>();

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

@@ -24,7 +24,6 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
var server = pair.Server;
var client = pair.Client;
var clientPlayerMgr = client.ResolveDependency<Robust.Client.Player.IPlayerManager>();
var clientUIMgr = client.ResolveDependency<IUserInterfaceManager>();
var clientEntManager = client.ResolveDependency<IEntityManager>();
@@ -57,9 +56,9 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
AlertsUI clientAlertsUI = default;
await client.WaitAssertion(() =>
{
var local = clientPlayerMgr.LocalPlayer;
var local = client.Session;
Assert.That(local, Is.Not.Null);
var controlled = local.ControlledEntity;
var controlled = local.AttachedEntity;
#pragma warning disable NUnit2045 // Interdependent assertions.
Assert.That(controlled, Is.Not.Null);
// Making sure it exists

8
Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
View File

@@ -189,10 +189,10 @@ public abstract partial class InteractionTest
// Get player data
var sPlayerMan = Server.ResolveDependency<Robust.Server.Player.IPlayerManager>();
var cPlayerMan = Client.ResolveDependency<Robust.Client.Player.IPlayerManager>();
if (cPlayerMan.LocalPlayer?.Session == null)
if (Client.Session == null)
Assert.Fail("No player");
ClientSession = cPlayerMan.LocalPlayer!.Session!;
ServerSession = sPlayerMan.GetSessionByUserId(ClientSession.UserId);
ClientSession = Client.Session!;
ServerSession = sPlayerMan.GetSessionById(ClientSession.UserId);
// Spawn player entity & attach
EntityUid? old = default;
@@ -240,7 +240,7 @@ public abstract partial class InteractionTest
Assert.Multiple(() =>
{
Assert.That(CEntMan.GetNetEntity(cPlayerMan.LocalEntity), Is.EqualTo(Player));
Assert.That(sPlayerMan.GetSessionByUserId(ClientSession.UserId).AttachedEntity, Is.EqualTo(SEntMan.GetEntity(Player)));
Assert.That(sPlayerMan.GetSessionById(ClientSession.UserId).AttachedEntity, Is.EqualTo(SEntMan.GetEntity(Player)));
});
}