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

Use component startup/shutdown in SubFloorHideSystem.

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-05-27 11:11:56 +02:00
parent 0ea3391af0
commit 9b402acfa3
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Content.Shared/GameObjects/EntitySystems/SubFloorHideSystem.cs
View File

@@ -53,10 +53,8 @@ namespace Content.Shared.GameObjects.EntitySystems
_mapManager.GridChanged += MapManagerOnGridChanged; _mapManager.GridChanged += MapManagerOnGridChanged;
_mapManager.TileChanged += MapManagerOnTileChanged; _mapManager.TileChanged += MapManagerOnTileChanged;
// TODO: Make this sane when EntityStarted becomes a directed event. SubscribeLocalEvent<SubFloorHideComponent, ComponentStartup>(OnSubFloorStarted);
EntityManager.EntityStarted += OnEntityStarted; SubscribeLocalEvent<SubFloorHideComponent, ComponentShutdown>(OnSubFloorTerminating);
SubscribeLocalEvent<SubFloorHideComponent, EntityTerminatingEvent>(OnSubFloorTerminating);
SubscribeLocalEvent<SubFloorHideComponent, SnapGridPositionChangedEvent>(OnSnapGridPositionChanged); SubscribeLocalEvent<SubFloorHideComponent, SnapGridPositionChangedEvent>(OnSnapGridPositionChanged);
} }
@@ -66,22 +64,14 @@ namespace Content.Shared.GameObjects.EntitySystems
_mapManager.GridChanged -= MapManagerOnGridChanged; _mapManager.GridChanged -= MapManagerOnGridChanged;
_mapManager.TileChanged -= MapManagerOnTileChanged; _mapManager.TileChanged -= MapManagerOnTileChanged;
EntityManager.EntityStarted -= OnEntityStarted;
UnsubscribeLocalEvent<SubFloorHideComponent, EntityTerminatingEvent>(OnSubFloorTerminating);
UnsubscribeLocalEvent<SubFloorHideComponent, SnapGridPositionChangedEvent>(OnSnapGridPositionChanged);
} }
private void OnEntityStarted(object? sender, EntityUid uid) private void OnSubFloorStarted(EntityUid uid, SubFloorHideComponent component, ComponentStartup _)
{ {
if (ComponentManager.HasComponent<SubFloorHideComponent>(uid)) UpdateEntity(uid);
{
UpdateEntity(uid);
}
} }
private void OnSubFloorTerminating(EntityUid uid, SubFloorHideComponent component, EntityTerminatingEvent args) private void OnSubFloorTerminating(EntityUid uid, SubFloorHideComponent component, ComponentShutdown _)
{ {
UpdateEntity(uid); UpdateEntity(uid);
} }