From 654cca13bfd905fc39829094e7e132c21ee24796 Mon Sep 17 00:00:00 2001 From: Vera Aguilera Puerto Date: Sun, 10 Jan 2021 16:01:16 +0100 Subject: [PATCH] Fixes disposals not flushing down stuff. Fixes #2933 --- .../GameObjects/Components/Disposal/DisposalEntryComponent.cs | 2 +- .../GameObjects/Components/Disposal/DisposalUnitComponent.cs | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalEntryComponent.cs b/Content.Server/GameObjects/Components/Disposal/DisposalEntryComponent.cs index b8fe213197..21a2409908 100644 --- a/Content.Server/GameObjects/Components/Disposal/DisposalEntryComponent.cs +++ b/Content.Server/GameObjects/Components/Disposal/DisposalEntryComponent.cs @@ -23,7 +23,7 @@ namespace Content.Server.GameObjects.Components.Disposal var holder = Owner.EntityManager.SpawnEntity(HolderPrototypeId, Owner.Transform.MapPosition); var holderComponent = holder.GetComponent(); - foreach (var entity in from.ContainedEntities) + foreach (var entity in from.ContainedEntities.ToArray()) { holderComponent.TryInsert(entity); } diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs b/Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs index b1abeb9455..d3f1b3230b 100644 --- a/Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs +++ b/Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs @@ -287,10 +287,6 @@ namespace Content.Server.GameObjects.Components.Disposal } var entryComponent = entry.GetComponent(); - foreach (var entity in _container.ContainedEntities.ToList()) - { - _container.Remove(entity); - } if (Owner.Transform.Coordinates.TryGetTileAtmosphere(out var tileAtmos) && tileAtmos.Air != null &&