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

Fix of PERSISTENT headsets (#13784)

Browse Source 
Closes https://github.com/space-wizards/space-station-14/issues/13783
This commit is contained in:
AlexMorgan3817
2023-01-29 18:32:08 +00:00
committed by GitHub
parent ad576eb0c5
commit daea9eab72
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Server/Radio/EntitySystems/HeadsetSystem.cs
View File

@@ -12,7 +12,6 @@ using Robust.Shared.Containers;
using Robust.Shared.Network; using Robust.Shared.Network;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using System.Linq; using System.Linq;
using Robust.Shared.Profiling;
namespace Content.Server.Radio.EntitySystems; namespace Content.Server.Radio.EntitySystems;
@@ -58,12 +57,13 @@ public sealed class HeadsetSystem : EntitySystem
if (component.IsEquipped && component.Enabled) if (component.IsEquipped && component.Enabled)
{ {
EnsureComp<WearingHeadsetComponent>(args.Equipee).Headset = uid; EnsureComp<WearingHeadsetComponent>(args.Equipee).Headset = uid;
PushRadioChannelsToOwner(uid, component, EnsureComp<ActiveRadioComponent>(uid)); UpdateRadioChannelsInActiveRadio(uid, component, EnsureComp<ActiveRadioComponent>(uid));
} }
} }
private void PushRadioChannelsToOwner(EntityUid uid, HeadsetComponent component, ActiveRadioComponent activeRadio) private void UpdateRadioChannelsInActiveRadio(EntityUid uid, HeadsetComponent component, ActiveRadioComponent activeRadio)
{ {
activeRadio.Channels.Clear();
activeRadio.Channels.UnionWith(component.Channels); activeRadio.Channels.UnionWith(component.Channels);
} }
@@ -131,12 +131,7 @@ public sealed class HeadsetSystem : EntitySystem
private bool InstallKey(HeadsetComponent component, EntityUid key, EncryptionKeyComponent keyComponent) private bool InstallKey(HeadsetComponent component, EntityUid key, EncryptionKeyComponent keyComponent)
{ {
if (component.KeyContainer.Insert(key)) return component.KeyContainer.Insert(key);
{
UploadChannelsFromKey(component, keyComponent);
return true;
}
return false;
} }
private void UploadChannelsFromKey(HeadsetComponent component, EncryptionKeyComponent key) private void UploadChannelsFromKey(HeadsetComponent component, EncryptionKeyComponent key)
@@ -225,7 +220,7 @@ public sealed class HeadsetSystem : EntitySystem
{ {
UpdateDefaultChannel(component); UpdateDefaultChannel(component);
UploadChannelsFromKey(component, added); UploadChannelsFromKey(component, added);
PushRadioChannelsToOwner(uid, component, EnsureComp<ActiveRadioComponent>(uid)); UpdateRadioChannelsInActiveRadio(uid, component, EnsureComp<ActiveRadioComponent>(uid));
} }
return; return;
} }