space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add additional container assert (#3397)

Browse Source
This commit is contained in:
Leon Friedrich
2022-10-29 12:53:29 +13:00
committed by GitHub
parent 3fba59eb6c
commit 94aeb309b2
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Robust.Shared/Containers/BaseContainer.cs
View File

@@ -207,6 +207,7 @@ namespace Robust.Shared.Containers
IoCManager.Resolve(ref entMan);
DebugTools.Assert(entMan.EntityExists(toremove));
DebugTools.Assert(xform == null || xform.Owner == toremove);
DebugTools.Assert(entMan.GetComponent<MetaDataComponent>(Owner).EntityLifeStage < EntityLifeStage.Terminating);
if (!CanRemove(toremove, entMan)) return false;
InternalRemove(toremove, entMan, meta);

7
Robust.Shared/GameObjects/EntityManager.cs
View File

@@ -333,11 +333,8 @@ namespace Robust.Shared.GameObjects
{
var transform = xformQuery.GetComponent(metadata.Owner);
metadata.EntityLifeStage = EntityLifeStage.Terminating;
var ev = new EntityTerminatingEvent(metadata.Owner);
// TODO: consider making this a meta-data flag?
// veeeery few entities make use of this event.
EventBus.RaiseLocalEvent(metadata.Owner, ref ev, false);
var ev = new EntityTerminatingEvent();
EventBus.RaiseLocalEvent(metadata.Owner, ref ev);
foreach (var child in transform._children)
{

8
Robust.Shared/GameObjects/EntitySystemMessages/EntityTerminatingEvent.cs
View File

@@ -4,13 +4,7 @@ namespace Robust.Shared.GameObjects
/// The children of this entity are about to be deleted.
/// </summary>
[ByRefEvent]
public struct EntityTerminatingEvent
public readonly struct EntityTerminatingEvent
{
public EntityUid Owner;
public EntityTerminatingEvent(EntityUid uid)
{
Owner = uid;
}
}
}