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

Remove some client IEnumerables (#16501)

Browse Source
This commit is contained in:
metalgearsloth
2023-05-16 22:55:22 +10:00
committed by GitHub
parent e91fc652a3
commit 64bb57cdef
6 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/Anomaly/AnomalySystem.cs
View File

@@ -59,7 +59,9 @@ public sealed class AnomalySystem : SharedAnomalySystem
{
base.Update(frameTime);
foreach (var (super, sprite) in EntityQuery<AnomalySupercriticalComponent, SpriteComponent>())
var query = EntityQueryEnumerator<AnomalySupercriticalComponent, SpriteComponent>();
while (query.MoveNext(out var super, out var sprite))
{
var completion = 1f - (float) ((super.EndTime - _timing.CurTime) / super.SupercriticalDuration);
var scale = completion * (super.MaxScaleAmount - 1f) + 1f;

20
Content.Client/SurveillanceCamera/SurveillanceCameraMonitorSystem.cs
View File

@@ -6,23 +6,17 @@ public sealed class SurveillanceCameraMonitorSystem : EntitySystem
{
public override void Update(float frameTime)
{
foreach (var comp in EntityQuery<ActiveSurveillanceCameraMonitorVisualsComponent>())
{
if (Paused(comp.Owner))
{
continue;
}
var query = EntityQueryEnumerator<ActiveSurveillanceCameraMonitorVisualsComponent>();
while (query.MoveNext(out var uid, out var comp))
{
comp.TimeLeft -= frameTime;
if (comp.TimeLeft <= 0 || Deleted(comp.Owner))
if (comp.TimeLeft <= 0)
{
if (comp.OnFinish != null)
{
comp.OnFinish();
}
comp.OnFinish?.Invoke();
EntityManager.RemoveComponentDeferred<ActiveSurveillanceCameraMonitorVisualsComponent>(comp.Owner);
RemCompDeferred<ActiveSurveillanceCameraMonitorVisualsComponent>(uid);
}
}
}
@@ -35,6 +29,6 @@ public sealed class SurveillanceCameraMonitorSystem : EntitySystem
public void RemoveTimer(EntityUid uid)
{
EntityManager.RemoveComponentDeferred<ActiveSurveillanceCameraMonitorVisualsComponent>(uid);
RemCompDeferred<ActiveSurveillanceCameraMonitorVisualsComponent>(uid);
}
}