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

Remove EntityInitializedMessage (#3657)

Browse Source
This commit is contained in:
metalgearsloth
2023-01-05 20:00:47 +11:00
committed by GitHub
parent 7522737d90
commit fb0907a1a4
4 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASE-NOTES.md
View File

@@ -35,7 +35,7 @@ END TEMPLATE-->
### Breaking changes
*None yet*
* EntityInitializedMessage has been removed; the C# event invoked on EntityManager (EntityInitialized) should be used in its place.
### New features

14
Robust.Client/GameObjects/EntitySystems/ContainerSystem.cs
View File

@@ -30,26 +30,32 @@ namespace Robust.Client.GameObjects
{
base.Initialize();
SubscribeLocalEvent<EntityInitializedMessage>(HandleEntityInitialized);
EntityManager.EntityInitialized += HandleEntityInitialized;
SubscribeLocalEvent<ContainerManagerComponent, ComponentHandleState>(HandleComponentState);
UpdatesBefore.Add(typeof(SpriteSystem));
}
public override void Shutdown()
{
EntityManager.EntityInitialized -= HandleEntityInitialized;
base.Shutdown();
}
protected override void ValidateMissingEntity(EntityUid uid, IContainer cont, EntityUid missing)
{
DebugTools.Assert(ExpectedEntities.TryGetValue(missing, out var expectedContainer) && expectedContainer == cont && cont.ExpectedEntities.Contains(missing));
}
private void HandleEntityInitialized(EntityInitializedMessage ev)
private void HandleEntityInitialized(EntityUid uid)
{
if (!RemoveExpectedEntity(ev.Entity, out var container))
if (!RemoveExpectedEntity(uid, out var container))
return;
if (container.Deleted)
return;
container.Insert(ev.Entity);
container.Insert(uid);
}
private void HandleComponentState(EntityUid uid, ContainerManagerComponent component, ref ComponentHandleState args)

1
Robust.Shared/GameObjects/EntityManager.Components.cs
View File

@@ -160,7 +160,6 @@ namespace Robust.Shared.GameObjects
#endif
DebugTools.Assert(metadata.EntityLifeStage == EntityLifeStage.Initializing);
metadata.EntityLifeStage = EntityLifeStage.Initialized;
EventBus.RaiseEvent(EventSource.Local, new EntityInitializedMessage(uid));
}
public void StartComponents(EntityUid uid)

12
Robust.Shared/GameObjects/EntitySystemMessages/EntityInitializedMessage.cs
View File

@@ -1,12 +0,0 @@
namespace Robust.Shared.GameObjects
{
public readonly struct EntityInitializedMessage
{
public EntityUid Entity { get; }
public EntityInitializedMessage(EntityUid entity)
{
Entity = entity;
}
}
}