diff --git a/Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs b/Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs index 68ebf1b5e7..1d025efc28 100644 --- a/Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs @@ -74,7 +74,7 @@ namespace Content.Client.GameObjects.Components.Kitchen } - private void RefreshContentsDisplay(List reagents, List solids) + private void RefreshContentsDisplay(IReadOnlyList reagents, List solids) { _menu.IngredientsList.Clear(); foreach (var item in reagents) diff --git a/Content.Server/GameObjects/Components/Kitchen/KitchenMicrowaveComponent.cs b/Content.Server/GameObjects/Components/Kitchen/KitchenMicrowaveComponent.cs index 419c44dc30..6fcd84c124 100644 --- a/Content.Server/GameObjects/Components/Kitchen/KitchenMicrowaveComponent.cs +++ b/Content.Server/GameObjects/Components/Kitchen/KitchenMicrowaveComponent.cs @@ -172,7 +172,7 @@ namespace Content.Server.GameObjects.Components.Kitchen _solidsVisualList.Add(item.Uid); } - _userInterface.SetState(new MicrowaveUpdateUserInterfaceState(_solution.Solution.Contents.ToList(), _solidsVisualList)); + _userInterface.SetState(new MicrowaveUpdateUserInterfaceState(_solution.Solution.Contents, _solidsVisualList)); } void IActivate.Activate(ActivateEventArgs eventArgs) @@ -310,8 +310,9 @@ namespace Content.Server.GameObjects.Components.Kitchen private void VaporizeSolids() { - foreach (var item in _storage.ContainedEntities.ToList()) + for(var i = _storage.ContainedEntities.Count-1; i>=0; i--) { + var item = _storage.ContainedEntities.ElementAt(i); _storage.Remove(item); item.Delete(); } @@ -321,9 +322,9 @@ namespace Content.Server.GameObjects.Components.Kitchen private void EjectSolids() { - foreach (var item in _storage.ContainedEntities.ToList()) + for(var i = _storage.ContainedEntities.Count-1; i>=0; i--) { - _storage.Remove(item); + _storage.Remove(_storage.ContainedEntities.ElementAt(i)); } _solids.Clear(); diff --git a/Content.Shared/Kitchen/SharedMicrowaveComponent.cs b/Content.Shared/Kitchen/SharedMicrowaveComponent.cs index 5707172db1..253e9302d4 100644 --- a/Content.Shared/Kitchen/SharedMicrowaveComponent.cs +++ b/Content.Shared/Kitchen/SharedMicrowaveComponent.cs @@ -57,9 +57,9 @@ namespace Content.Shared.Kitchen [NetSerializable, Serializable] public class MicrowaveUpdateUserInterfaceState : BoundUserInterfaceState { - public readonly List ReagentsReagents; + public readonly IReadOnlyList ReagentsReagents; public readonly List ContainedSolids; - public MicrowaveUpdateUserInterfaceState(List reagents, List solids) + public MicrowaveUpdateUserInterfaceState(IReadOnlyList reagents, List solids) { ReagentsReagents = reagents; ContainedSolids = solids;