Encryption keys Pai fix

SerbiaStrong-220 · Sep 23, 2024 · b9df268 · b9df268
1 parent 25dc94e
commit b9df268
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Content.Server/Radio/EntitySystems/RadioSystem.cs b/Content.Server/Radio/EntitySystems/RadioSystem.cs
@@ -265,13 +265,14 @@ private void OnEncryptionChannelsChangeTransmitter(Entity<IntrinsicRadioTransmit
 
     private void OnEncryptionChannelsChangeReceiver(Entity<IntrinsicRadioReceiverComponent> entity, ref EncryptionChannelsChangedEvent args)
     {
-        if (!TryComp<ActiveRadioComponent>(entity.Owner, out var activeRadio))
-            return;
-
-        HashSet<string> channels = entity.Comp.Channels;
+        HashSet<string> channels = new();
         channels.UnionWith(args.Component.Channels);
+        channels.UnionWith(entity.Comp.Channels);
 
-        activeRadio.Channels = new(channels);
+        if (channels.Count > 0)
+            EnsureComp<ActiveRadioComponent>(entity.Owner).Channels = channels;
+        else
+            RemComp<ActiveRadioComponent>(entity.Owner);
     }
     //SS220 PAI with encryption keys end
 }
diff --git a/Resources/Prototypes/SS220/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/SS220/Entities/Objects/Fun/pai.yml
@@ -45,6 +45,7 @@
   - type: IntrinsicRadioTransmitter
     channels:
     - Binary
+  - type: ActiveRadio
   - type: DoAfter
   - type: Actions
   - type: TypingIndicator