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

Fixes disposals not flushing down stuff.

Browse Source 
Fixes #2933
This commit is contained in:
Vera Aguilera Puerto
2021-01-10 16:01:16 +01:00
parent c557923cce
commit 654cca13bf
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/GameObjects/Components/Disposal/DisposalEntryComponent.cs
View File

@@ -23,7 +23,7 @@ namespace Content.Server.GameObjects.Components.Disposal
var holder = Owner.EntityManager.SpawnEntity(HolderPrototypeId, Owner.Transform.MapPosition); var holder = Owner.EntityManager.SpawnEntity(HolderPrototypeId, Owner.Transform.MapPosition);
var holderComponent = holder.GetComponent<DisposalHolderComponent>(); var holderComponent = holder.GetComponent<DisposalHolderComponent>();
foreach (var entity in from.ContainedEntities) foreach (var entity in from.ContainedEntities.ToArray())
{ {
holderComponent.TryInsert(entity); holderComponent.TryInsert(entity);
} }

4
Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs
View File

@@ -287,10 +287,6 @@ namespace Content.Server.GameObjects.Components.Disposal
} }
var entryComponent = entry.GetComponent<DisposalEntryComponent>(); var entryComponent = entry.GetComponent<DisposalEntryComponent>();
foreach (var entity in _container.ContainedEntities.ToList())
{
_container.Remove(entity);
}
if (Owner.Transform.Coordinates.TryGetTileAtmosphere(out var tileAtmos) && if (Owner.Transform.Coordinates.TryGetTileAtmosphere(out var tileAtmos) &&
tileAtmos.Air != null && tileAtmos.Air != null &&