tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small instrument system fix (#7432)

Browse Source
This commit is contained in:
mirrorcult
2022-04-05 00:08:05 -07:00
committed by GitHub
parent b7ff72ba6e
commit 7f2ceeb8e2
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Instruments/InstrumentSystem.cs
View File

@@ -67,6 +67,9 @@ public sealed partial class InstrumentSystem : SharedInstrumentSystem
private void OnBoundUIClosed(EntityUid uid, InstrumentComponent component, BoundUIClosedEvent args) private void OnBoundUIClosed(EntityUid uid, InstrumentComponent component, BoundUIClosedEvent args)
{ {
if (args.UiKey is not InstrumentUiKey)
return;
if (HasComp<ActiveInstrumentComponent>(uid) if (HasComp<ActiveInstrumentComponent>(uid)
&& _userInterfaceSystem.TryGetUi(uid, args.UiKey, out var bui) && _userInterfaceSystem.TryGetUi(uid, args.UiKey, out var bui)
&& bui.SubscribedSessions.Count == 0) && bui.SubscribedSessions.Count == 0)
@@ -79,6 +82,9 @@ public sealed partial class InstrumentSystem : SharedInstrumentSystem
private void OnBoundUIOpened(EntityUid uid, InstrumentComponent component, BoundUIOpenedEvent args) private void OnBoundUIOpened(EntityUid uid, InstrumentComponent component, BoundUIOpenedEvent args)
{ {
if (args.UiKey is not InstrumentUiKey)
return;
EnsureComp<ActiveInstrumentComponent>(uid); EnsureComp<ActiveInstrumentComponent>(uid);
Clean(uid, component); Clean(uid, component);
} }