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

Fix miasma flies (#10580)

Browse Source 
Looks like some of the exceptions still got through. Also had a redundant AttachParent.
This commit is contained in:
metalgearsloth
2022-09-17 07:14:45 +10:00
committed by GitHub
parent 3d693c20c8
commit 4262f4685e
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/Atmos/Miasma/MiasmaSystem.cs
View File

@@ -6,8 +6,8 @@ using Content.Server.Temperature.Systems;
using Content.Server.Body.Components; using Content.Server.Body.Components;
using Content.Shared.Examine; using Content.Shared.Examine;
using Content.Shared.Rejuvenate; using Content.Shared.Rejuvenate;
using Content.Shared.MobState.EntitySystems;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
using Content.Shared.Tag;
using Robust.Shared.Containers; using Robust.Shared.Containers;
using Robust.Shared.Physics.Components; using Robust.Shared.Physics.Components;
using Robust.Shared.Random; using Robust.Shared.Random;
@@ -19,6 +19,8 @@ namespace Content.Server.Atmos.Miasma
[Dependency] private readonly TransformSystem _transformSystem = default!; [Dependency] private readonly TransformSystem _transformSystem = default!;
[Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
[Dependency] private readonly DamageableSystem _damageableSystem = default!; [Dependency] private readonly DamageableSystem _damageableSystem = default!;
[Dependency] private readonly SharedMobStateSystem _mobState = default!;
[Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly IRobustRandom _random = default!;
/// System Variables /// System Variables
@@ -66,7 +68,7 @@ namespace Content.Server.Atmos.Miasma
/// </summary> /// </summary>
private float _poolAccumulator = 0f; private float _poolAccumulator = 0f;
/// <summmary> /// <summary>
/// How long without an infection before we pick a new disease. /// How long without an infection before we pick a new disease.
/// </summary> /// </summary>
private TimeSpan _poolRepickTime = TimeSpan.FromMinutes(5); private TimeSpan _poolRepickTime = TimeSpan.FromMinutes(5);
@@ -165,7 +167,7 @@ namespace Content.Server.Atmos.Miasma
private void OnMobStateChanged(EntityUid uid, PerishableComponent component, MobStateChangedEvent args) private void OnMobStateChanged(EntityUid uid, PerishableComponent component, MobStateChangedEvent args)
{ {
if (args.Component.IsDead()) if (_mobState.IsDead(uid))
EnsureComp<RottingComponent>(uid); EnsureComp<RottingComponent>(uid);
} }
@@ -218,7 +220,9 @@ namespace Content.Server.Atmos.Miasma
private void OnEntRemoved(EntityUid uid, AntiRottingContainerComponent component, EntRemovedFromContainerMessage args) private void OnEntRemoved(EntityUid uid, AntiRottingContainerComponent component, EntRemovedFromContainerMessage args)
{ {
if (TryComp<PerishableComponent>(args.Entity, out var perishable) && !Terminating(uid)) // If we get de-parented due to entity shutdown don't add more flies.
if (TryComp<PerishableComponent>(args.Entity, out var perishable) &&
TryComp<MetaDataComponent>(uid, out var metadata) && metadata.EntityLifeStage < EntityLifeStage.Terminating)
{ {
ModifyPreservationSource(args.Entity, false); ModifyPreservationSource(args.Entity, false);
ToggleDecomposition(args.Entity, true, perishable); ToggleDecomposition(args.Entity, true, perishable);
@@ -230,7 +234,6 @@ namespace Content.Server.Atmos.Miasma
private void OnFliesInit(EntityUid uid, FliesComponent component, ComponentInit args) private void OnFliesInit(EntityUid uid, FliesComponent component, ComponentInit args)
{ {
component.VirtFlies = EntityManager.SpawnEntity("AmbientSoundSourceFlies", Transform(uid).Coordinates); component.VirtFlies = EntityManager.SpawnEntity("AmbientSoundSourceFlies", Transform(uid).Coordinates);
Transform(component.VirtFlies).AttachParent(uid);
} }
private void OnFliesShutdown(EntityUid uid, FliesComponent component, ComponentShutdown args) private void OnFliesShutdown(EntityUid uid, FliesComponent component, ComponentShutdown args)