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

Remove IDestroyAct, IBreakAct (#7876)

Browse Source
This commit is contained in:
Alex Evgrashin
2022-05-03 01:43:25 +03:00
committed by GitHub
parent 5d23100af3
commit 50ae467c76
21 changed files with 135 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Destructible/DestructibleSystem.cs
View File

@@ -4,7 +4,6 @@ using Content.Server.Destructible.Thresholds.Behaviors;
using Content.Server.Destructible.Thresholds.Triggers;
using Content.Server.Explosion.EntitySystems;
using Content.Server.Stack;
using Content.Shared.Acts;
using Content.Shared.Damage;
using Content.Shared.FixedPoint;
using JetBrains.Annotations;
@@ -12,16 +11,16 @@ using Robust.Server.GameObjects;
using Robust.Shared.Prototypes;
using Robust.Shared.Random;
using System;
using Content.Shared.Destructible;
namespace Content.Server.Destructible
{
[UsedImplicitly]
public sealed class DestructibleSystem : EntitySystem
public sealed class DestructibleSystem : SharedDestructibleSystem
{
[Dependency] public readonly IRobustRandom Random = default!;
public new IEntityManager EntityManager => base.EntityManager;
[Dependency] public readonly ActSystem ActSystem = default!;
[Dependency] public readonly AudioSystem AudioSystem = default!;
[Dependency] public readonly ConstructionSystem ConstructionSystem = default!;
[Dependency] public readonly ExplosionSystem ExplosionSystem = default!;

12
Content.Server/Destructible/Thresholds/Behaviors/DoActsBehavior.cs
View File

@@ -1,9 +1,4 @@
using System;
using Content.Shared.Acts;
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization.Manager.Attributes;
namespace Content.Server.Destructible.Thresholds.Behaviors
namespace Content.Server.Destructible.Thresholds.Behaviors
{
[Serializable]
[DataDefinition]
@@ -11,7 +6,6 @@ namespace Content.Server.Destructible.Thresholds.Behaviors
{
/// <summary>
/// What acts should be triggered upon activation.
/// See <see cref="ActSystem"/>.
/// </summary>
[DataField("acts")]
public ThresholdActs Acts { get; set; }
@@ -25,12 +19,12 @@ namespace Content.Server.Destructible.Thresholds.Behaviors
{
if (HasAct(ThresholdActs.Breakage))
{
system.ActSystem.HandleBreakage(owner);
system.BreakEntity(owner);
}
if (HasAct(ThresholdActs.Destruction))
{
system.ActSystem.HandleDestruction(owner);
system.DestroyEntity(owner);
}
}
}