space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-09-15 06:42:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Automatically unsubscribe event bus registrations in entity system shutdown. (#1758)

Browse Source 
* Automatically unsubscribe event bus registrations in entity system shutdown.

* Fix incorrect unsubscription of local events, obsolete unsubscribe methods.

That's what we got tests for.

* = null instead of .Clear()
This commit is contained in:
Pieter-Jan Briers
2021-05-17 11:01:22 +02:00
committed by GitHub
parent c26ebcbc78
commit 96c0a4ae1f
16 changed files with 140 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Robust.Client/GameObjects/EntitySystems/AudioSystem.cs
-11
View File
@@ -41,17 +41,6 @@ namespace Robust.Client.GameObjects
_broadPhaseSystem = Get<SharedBroadPhaseSystem>();
}
public override void Shutdown()
{
base.Shutdown();
UnsubscribeNetworkEvent<PlayAudioEntityMessage>();
UnsubscribeNetworkEvent<PlayAudioGlobalMessage>();
UnsubscribeNetworkEvent<PlayAudioPositionalMessage>();
UnsubscribeNetworkEvent<StopAudioMessageClient>();
UnsubscribeLocalEvent<SoundSystem.QueryAudioSystem>();
}
private void StopAudioMessageHandler(StopAudioMessageClient ev)
{
var stream = _playingClydeStreams.Find(p => p.NetIdentifier == ev.Identifier);
Robust.Client/GameObjects/EntitySystems/ClientOccluderSystem.cs
-9
View File
@@ -38,15 +38,6 @@ namespace Robust.Client.GameObjects
SubscribeLocalEvent<ClientOccluderComponent, SnapGridPositionChangedEvent>(HandleSnapGridMove);
}
/// <inheritdoc />
public override void Shutdown()
{
UnsubscribeLocalEvent<OccluderDirtyEvent>();
UnsubscribeLocalEvent<ClientOccluderComponent, SnapGridPositionChangedEvent>();
base.Shutdown();
}
public override void FrameUpdate(float frameTime)
{
base.FrameUpdate(frameTime);
Robust.Client/GameObjects/EntitySystems/RenderingTreeSystem.cs
+1 -7
View File
@@ -58,17 +58,11 @@ namespace Robust.Client.GameObjects
public override void Shutdown()
{
base.Shutdown();
_mapManager.MapCreated -= MapManagerOnMapCreated;
_mapManager.MapDestroyed -= MapManagerOnMapDestroyed;
_mapManager.OnGridCreated -= MapManagerOnGridCreated;
_mapManager.OnGridRemoved -= MapManagerOnGridRemoved;
UnsubscribeLocalEvent<EntMapIdChangedMessage>();
UnsubscribeLocalEvent<MoveEvent>();
UnsubscribeLocalEvent<EntParentChangedMessage>();
UnsubscribeLocalEvent<PointLightRadiusChangedMessage>();
UnsubscribeLocalEvent<RenderTreeRemoveSpriteMessage>();
UnsubscribeLocalEvent<RenderTreeRemoveLightMessage>();
}
// For these next 2 methods (the Remove* ones):
Robust.Client/GameObjects/EntitySystems/UserInterfaceSystem.cs
-8
View File
@@ -22,14 +22,6 @@ namespace Robust.Client.GameObjects
}
}
public override void Shutdown()
{
base.Shutdown();
UnsubscribeNetworkEvent<BoundUIWrapMessage>();
UnsubscribeLocalEvent<ClientUserInterfaceComponent, ComponentShutdown>();
}
private void MessageReceived(BoundUIWrapMessage ev)
{
var cmp = ComponentManager.GetComponent<ClientUserInterfaceComponent>(ev.Entity);