tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove PoolSettings.ExtraPrototypes option (#18678)

Browse Source
This commit is contained in:
Leon Friedrich
2023-08-05 16:16:48 +12:00
committed by GitHub
parent c2beaff3ac
commit d58786faf4
51 changed files with 463 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs
View File

@@ -12,10 +12,11 @@ namespace Content.IntegrationTests.Tests.DoAfter
[TestOf(typeof(DoAfterComponent))]
public sealed class DoAfterServerTest
{
[TestPrototypes]
private const string Prototypes = @"
- type: entity
name: Dummy
id: Dummy
name: DoAfterDummy
id: DoAfterDummy
components:
- type: DoAfter
";
@@ -60,8 +61,7 @@ namespace Content.IntegrationTests.Tests.DoAfter
{
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings
{
NoClient = true,
ExtraPrototypes = Prototypes
NoClient = true
});
var server = pairTracker.Pair.Server;
await server.WaitIdleAsync();
@@ -75,7 +75,7 @@ namespace Content.IntegrationTests.Tests.DoAfter
await server.WaitPost(() =>
{
var tickTime = 1.0f / timing.TickRate;
var mob = entityManager.SpawnEntity("Dummy", MapCoordinates.Nullspace);
var mob = entityManager.SpawnEntity("DoAfterDummy", MapCoordinates.Nullspace);
var args = new DoAfterArgs(mob, tickTime / 2, ev, null) { Broadcast = true };
#pragma warning disable NUnit2045 // Interdependent assertions.
Assert.That(doAfterSystem.TryStartDoAfter(args));
@@ -94,8 +94,7 @@ namespace Content.IntegrationTests.Tests.DoAfter
{
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings
{
NoClient = true,
ExtraPrototypes = Prototypes
NoClient = true
});
var server = pairTracker.Pair.Server;
var entityManager = server.ResolveDependency<IEntityManager>();
@@ -107,7 +106,7 @@ namespace Content.IntegrationTests.Tests.DoAfter
{
var tickTime = 1.0f / timing.TickRate;
var mob = entityManager.SpawnEntity("Dummy", MapCoordinates.Nullspace);
var mob = entityManager.SpawnEntity("DoAfterDummy", MapCoordinates.Nullspace);
var args = new DoAfterArgs(mob, tickTime * 2, ev, null) { Broadcast = true };
if (!doAfterSystem.TryStartDoAfter(args, out var id))