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

And not a single "ToList()" went home to their family that day.....

Browse Source
This commit is contained in:
FLOZ
2020-05-04 14:39:33 -05:00
parent 4034458d26
commit 108bd36b8c
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs
View File

@@ -74,7 +74,7 @@ namespace Content.Client.GameObjects.Components.Kitchen
}
private void RefreshContentsDisplay(List<Solution.ReagentQuantity> reagents, List<EntityUid> solids)
private void RefreshContentsDisplay(IReadOnlyList<Solution.ReagentQuantity> reagents, List<EntityUid> solids)
{
_menu.IngredientsList.Clear();
foreach (var item in reagents)

9
Content.Server/GameObjects/Components/Kitchen/KitchenMicrowaveComponent.cs
View File

@@ -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();

4
Content.Shared/Kitchen/SharedMicrowaveComponent.cs
View File

@@ -57,9 +57,9 @@ namespace Content.Shared.Kitchen
[NetSerializable, Serializable]
public class MicrowaveUpdateUserInterfaceState : BoundUserInterfaceState
{
public readonly List<Solution.ReagentQuantity> ReagentsReagents;
public readonly IReadOnlyList<Solution.ReagentQuantity> ReagentsReagents;
public readonly List<EntityUid> ContainedSolids;
public MicrowaveUpdateUserInterfaceState(List<Solution.ReagentQuantity> reagents, List<EntityUid> solids)
public MicrowaveUpdateUserInterfaceState(IReadOnlyList<Solution.ReagentQuantity> reagents, List<EntityUid> solids)
{
ReagentsReagents = reagents;
ContainedSolids = solids;