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

Change components to use timer component (#2426)

Browse Source 
* Change components to use timer component

* Fix old usages of tokens
This commit is contained in:
DrSmugleaf
2020-10-30 05:02:49 +01:00
committed by GitHub
parent c86c378198
commit 37e97ca89f
24 changed files with 59 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs
View File

@@ -29,6 +29,7 @@ using Robust.Shared.Audio;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components;
using Robust.Shared.GameObjects.Components.Timers;
using Robust.Shared.GameObjects.Components.Transform;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects;
@@ -139,7 +140,7 @@ namespace Content.Server.GameObjects.Components.Disposal
}
if (!entity.TryGetComponent(out IPhysicsComponent? physics) ||
if (!entity.TryGetComponent(out IPhysicsComponent? physics) ||
!physics.CanCollide)
{
if (!(entity.TryGetComponent(out IDamageableComponent? damageState) && damageState.CurrentState == DamageState.Dead)) {
@@ -165,7 +166,7 @@ namespace Content.Server.GameObjects.Components.Disposal
_automaticEngageToken = new CancellationTokenSource();
Timer.Spawn(_automaticEngageTime, () =>
Owner.SpawnTimer(_automaticEngageTime, () =>
{
if (!TryFlush())
{
@@ -260,7 +261,7 @@ namespace Content.Server.GameObjects.Components.Disposal
if (Engaged && CanFlush())
{
Timer.Spawn(_flushDelay, () => TryFlush());
Owner.SpawnTimer(_flushDelay, () => TryFlush());
}
}