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

Fix disposal unit power issues (#1564)

Browse Source 
* Fix being forever eaten by an unpowered unit

* Add 0 hands check to getting out of an unit

* Add engage check when the power is changed

* Remove redundant serializable field

* Add queueing an autoengage when power is turned back on, the unit is engaged and it doesnt flush with items inside

* Make TryQueueEngage check for no contained entities

* Remove redundant check

* Fix flushing animation not being played when powering an engaged unit
This commit is contained in:
DrSmugleaf
2020-08-01 14:10:24 +02:00
committed by GitHub
parent d7d36f090a
commit 808791f498
1 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,9 +61,6 @@ namespace Content.Server.GameObjects.Components.Disposal
private bool _engaged;
[ViewVariables]
private TimeSpan _engageTime;
[ViewVariables]
private TimeSpan _automaticEngageTime;
@@ -131,11 +128,27 @@ namespace Content.Server.GameObjects.Components.Disposal
return _container.CanInsert(entity);
}
private void AfterInsert(IEntity entity)
private void TryQueueEngage()
{
if (!Powered && ContainedEntities.Count == 0)
{
return;
}
_automaticEngageToken = new CancellationTokenSource();
Timer.Spawn(_automaticEngageTime, () => TryFlush(), _automaticEngageToken.Token);
Timer.Spawn(_automaticEngageTime, () =>
{
if (!TryFlush())
{
TryQueueEngage();
}
}, _automaticEngageToken.Token);
}
private void AfterInsert(IEntity entity)
{
TryQueueEngage();
if (entity.TryGetComponent(out IActorComponent actor))
{
@@ -404,7 +417,18 @@ namespace Content.Server.GameObjects.Components.Disposal
private void PowerStateChanged(object? sender, PowerStateEventArgs args)
{
if (!args.Powered)
{
_automaticEngageToken?.Cancel();
_automaticEngageToken = null;
}
UpdateVisualState();
if (Engaged && !TryFlush())
{
TryQueueEngage();
}
}
public override void ExposeData(ObjectSerializer serializer)
@@ -418,10 +442,10 @@ namespace Content.Server.GameObjects.Components.Disposal
() => _pressure);
serializer.DataReadWriteFunction(
"engageTime",
2,
seconds => _engageTime = TimeSpan.FromSeconds(seconds),
() => (int) _engageTime.TotalSeconds);
"automaticEngageTime",
30,
seconds => _automaticEngageTime = TimeSpan.FromSeconds(seconds),
() => (int) _automaticEngageTime.TotalSeconds);
serializer.DataReadWriteFunction(
"automaticEngageTime",
@@ -493,8 +517,8 @@ namespace Content.Server.GameObjects.Components.Disposal
switch (message)
{
case RelayMovementEntityMessage msg:
if (Engaged ||
!msg.Entity.HasComponent<HandsComponent>() ||
if (!msg.Entity.TryGetComponent(out HandsComponent hands) ||
hands.Count == 0 ||
_gameTiming.CurTime < _lastExitAttempt + ExitAttemptDelay)
{
break;