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

fix key debug assert on round restart (#16296)

Browse Source
This commit is contained in:
deltanedas
2023-05-11 03:00:29 +00:00
committed by GitHub
parent 20748cc542
commit 7955183b31
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,7 @@ public sealed class HeadsetSystem : SharedHeadsetSystem
SubscribeLocalEvent<HeadsetComponent, EncryptionChannelsChangedEvent>(OnKeysChanged); SubscribeLocalEvent<HeadsetComponent, EncryptionChannelsChangedEvent>(OnKeysChanged);
SubscribeLocalEvent<WearingHeadsetComponent, EntitySpokeEvent>(OnSpeak); SubscribeLocalEvent<WearingHeadsetComponent, EntitySpokeEvent>(OnSpeak);
SubscribeLocalEvent<HeadsetComponent, EmpPulseEvent>(OnEmpPulse); SubscribeLocalEvent<HeadsetComponent, EmpPulseEvent>(OnEmpPulse);
} }
@@ -33,7 +33,8 @@ public sealed class HeadsetSystem : SharedHeadsetSystem
private void UpdateRadioChannels(EntityUid uid, HeadsetComponent headset, EncryptionKeyHolderComponent? keyHolder = null) private void UpdateRadioChannels(EntityUid uid, HeadsetComponent headset, EncryptionKeyHolderComponent? keyHolder = null)
{ {
if (!headset.Enabled) // make sure to not add ActiveRadioComponent when headset is being deleted
if (!headset.Enabled || MetaData(uid).EntityLifeStage >= EntityLifeStage.Terminating)
return; return;
if (!Resolve(uid, ref keyHolder)) if (!Resolve(uid, ref keyHolder))