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

Fix radio exception (#11827)

Browse Source
This commit is contained in:
Leon Friedrich
2022-10-11 13:55:42 +13:00
committed by GitHub
parent 436131e9f4
commit 8fca213fa6
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Server/Radio/Components/HandheldRadioComponent.cs
View File

@@ -19,9 +19,9 @@ namespace Content.Server.Radio.Components
public sealed class HandheldRadioComponent : Component, IListen, IRadio public sealed class HandheldRadioComponent : Component, IListen, IRadio
#pragma warning restore 618 #pragma warning restore 618
{ {
private ChatSystem _chatSystem = default!; private ChatSystem? _chatSystem;
private RadioSystem _radioSystem = default!; private RadioSystem? _radioSystem;
private IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
private bool _radioOn; private bool _radioOn;
[DataField("channels", customTypeSerializer: typeof(PrototypeIdHashSetSerializer<RadioChannelPrototype>))] [DataField("channels", customTypeSerializer: typeof(PrototypeIdHashSetSerializer<RadioChannelPrototype>))]
@@ -54,14 +54,13 @@ namespace Content.Server.Radio.Components
_radioSystem = EntitySystem.Get<RadioSystem>(); _radioSystem = EntitySystem.Get<RadioSystem>();
_chatSystem = EntitySystem.Get<ChatSystem>(); _chatSystem = EntitySystem.Get<ChatSystem>();
IoCManager.Resolve(ref _prototypeManager);
RadioOn = false; RadioOn = false;
} }
public void Speak(string message) public void Speak(string message)
{ {
_chatSystem.TrySendInGameICMessage(Owner, message, InGameICChatType.Speak, false); _chatSystem?.TrySendInGameICMessage(Owner, message, InGameICChatType.Speak, false);
} }
public bool Use(EntityUid user) public bool Use(EntityUid user)
@@ -109,7 +108,7 @@ namespace Content.Server.Radio.Components
public void Broadcast(string message, EntityUid speaker, RadioChannelPrototype channel) public void Broadcast(string message, EntityUid speaker, RadioChannelPrototype channel)
{ {
_radioSystem.SpreadMessage(this, speaker, message, channel); _radioSystem?.SpreadMessage(this, speaker, message, channel);
} }
} }
} }