diff --git a/Content.Client/SurveillanceCamera/SurveillanceCameraMonitorSystem.cs b/Content.Client/SurveillanceCamera/SurveillanceCameraMonitorSystem.cs index 31fe357427..c946062128 100644 --- a/Content.Client/SurveillanceCamera/SurveillanceCameraMonitorSystem.cs +++ b/Content.Client/SurveillanceCamera/SurveillanceCameraMonitorSystem.cs @@ -4,8 +4,6 @@ namespace Content.Client.SurveillanceCamera; public sealed class SurveillanceCameraMonitorSystem : EntitySystem { - private readonly RemQueue _toRemove = new(); - public override void Update(float frameTime) { foreach (var comp in EntityQuery()) @@ -24,16 +22,9 @@ public sealed class SurveillanceCameraMonitorSystem : EntitySystem comp.OnFinish(); } - _toRemove.Add(comp.Owner); + EntityManager.RemoveComponentDeferred(comp.Owner); } } - - foreach (var uid in _toRemove) - { - EntityManager.RemoveComponent(uid); - } - - _toRemove.List?.Clear(); } public void AddTimer(EntityUid uid, Action onFinish)