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

fix rotting not pausing sometimes (#16818)

Browse Source
This commit is contained in:
Nemanja
2023-05-25 18:05:33 -04:00
committed by GitHub
parent 507df815f4
commit b7da56d007
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Atmos/Miasma/RottingSystem.cs
View File

@@ -11,7 +11,6 @@ using Content.Shared.Rejuvenate;
using Robust.Server.Containers; using Robust.Server.Containers;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
using Robust.Shared.Physics.Components; using Robust.Shared.Physics.Components;
using Robust.Shared.Random;
using Robust.Shared.Timing; using Robust.Shared.Timing;
namespace Content.Server.Atmos.Miasma; namespace Content.Server.Atmos.Miasma;
@@ -19,7 +18,6 @@ namespace Content.Server.Atmos.Miasma;
public sealed class RottingSystem : EntitySystem public sealed class RottingSystem : EntitySystem
{ {
[Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly AtmosphereSystem _atmosphere = default!; [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
[Dependency] private readonly ContainerSystem _container = default!; [Dependency] private readonly ContainerSystem _container = default!;
[Dependency] private readonly DamageableSystem _damageable = default!; [Dependency] private readonly DamageableSystem _damageable = default!;
@@ -171,12 +169,12 @@ public sealed class RottingSystem : EntitySystem
var rotQuery = EntityQueryEnumerator<RottingComponent, PerishableComponent, TransformComponent>(); var rotQuery = EntityQueryEnumerator<RottingComponent, PerishableComponent, TransformComponent>();
while (rotQuery.MoveNext(out var uid, out var rotting, out var perishable, out var xform)) while (rotQuery.MoveNext(out var uid, out var rotting, out var perishable, out var xform))
{ {
if (!IsRotProgressing(uid, perishable))
continue;
if (_timing.CurTime < rotting.NextRotUpdate) // This is where it starts to get noticable on larger animals, no need to run every second if (_timing.CurTime < rotting.NextRotUpdate) // This is where it starts to get noticable on larger animals, no need to run every second
continue; continue;
rotting.NextRotUpdate += rotting.RotUpdateRate; rotting.NextRotUpdate += rotting.RotUpdateRate;
if (!IsRotProgressing(uid, perishable))
continue;
rotting.TotalRotTime += rotting.RotUpdateRate; rotting.TotalRotTime += rotting.RotUpdateRate;
if (rotting.DealDamage) if (rotting.DealDamage)