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

Fix quantum dispose (#24772)

Browse Source 
* Fix quantum disposable issue

* remove force

* Iterate over all the disposal holder children instead of contained ones
This commit is contained in:
Kot
2024-02-05 00:10:30 +04:00
committed by GitHub
parent aa86b93add
commit 50e38cbd21
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs
View File

@@ -36,8 +36,6 @@ namespace Content.Server.Disposal.Unit.EntitySystems
private EntityQuery<PhysicsComponent> _physicsQuery; private EntityQuery<PhysicsComponent> _physicsQuery;
private EntityQuery<TransformComponent> _xformQuery; private EntityQuery<TransformComponent> _xformQuery;
private List<EntityUid> _entList = new();
public override void Initialize() public override void Initialize()
{ {
base.Initialize(); base.Initialize();
@@ -119,15 +117,17 @@ namespace Content.Server.Disposal.Unit.EntitySystems
} }
} }
_entList.Clear(); // We're purposely iterating over all the holder's children
_entList.AddRange(holder.Container.ContainedEntities); // because the holder might have something teleported into it,
// outside the usual container insertion logic.
foreach (var entity in _entList) var children = holderTransform.ChildEnumerator;
while (children.MoveNext(out var entity))
{ {
RemComp<BeingDisposedComponent>(entity); RemComp<BeingDisposedComponent>(entity);
var meta = _metaQuery.GetComponent(entity); var meta = _metaQuery.GetComponent(entity);
_containerSystem.Remove((entity, null, meta), holder.Container, reparent: false, force: true); if (holder.Container.Contains(entity))
_containerSystem.Remove((entity, null, meta), holder.Container, reparent: false, force: true);
var xform = _xformQuery.GetComponent(entity); var xform = _xformQuery.GetComponent(entity);
if (xform.ParentUid != uid) if (xform.ParentUid != uid)