Bump engine to 0.19.0.0 (#8417)

This commit is contained in:
Pieter-Jan Briers
2022-05-28 16:29:12 +02:00
committed by GitHub
parent 5dbe77ecba
commit cb95d2ae8d
15 changed files with 31 additions and 14 deletions

View File

@@ -1,7 +1,9 @@
using System.Collections.Generic;
using Content.Server.Destructible;
using Content.Shared.GameTicking;
using Content.Shared.Module;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
namespace Content.IntegrationTests.Tests.Destructible
{
@@ -11,11 +13,17 @@ namespace Content.IntegrationTests.Tests.Destructible
/// </summary>
public sealed class TestDestructibleListenerSystem : EntitySystem
{
[Dependency] private readonly IModuleManager _modManager;
public readonly List<DamageThresholdReached> ThresholdsReached = new();
public override void Initialize()
{
base.Initialize();
if (_modManager.IsClientModule)
return;
SubscribeLocalEvent<DestructibleComponent, DamageThresholdReached>(AddThresholdsToList);
SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestart);
}

View File

@@ -253,9 +253,9 @@ namespace Content.IntegrationTests.Tests
mapManager.DoMapInitialize(mapId);
});
var distinctComponents = new List<(List<Type> components, List<Type> references)>
var distinctComponents = new List<(List<CompIdx> components, List<CompIdx> references)>
{
(new List<Type>(), new List<Type>())
(new List<CompIdx>(), new List<CompIdx>())
};
// Split components into groups, ensuring that their references don't conflict
@@ -272,14 +272,14 @@ namespace Content.IntegrationTests.Tests
// Ensure the next list if this one has conflicting references
if (i + 1 >= distinctComponents.Count)
{
distinctComponents.Add((new List<Type>(), new List<Type>()));
distinctComponents.Add((new List<CompIdx>(), new List<CompIdx>()));
}
continue;
}
// Add the component and its references if no conflicting references were found
distinct.components.Add(type);
distinct.components.Add(registration.Idx);
distinct.references.AddRange(registration.References);
}
}