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

fix radiosystem popup (#14121)

Browse Source
This commit is contained in:
Nemanja
2023-02-15 00:53:13 -05:00
committed by GitHub
parent 0b44fb879c
commit 64e882bb6d
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/Radio/EntitySystems/RadioSystem.cs
View File

@@ -71,26 +71,27 @@ public sealed class RadioSystem : EntitySystem
var ev = new RadioReceiveEvent(message, source, channel, chatMsg, radioSource); var ev = new RadioReceiveEvent(message, source, channel, chatMsg, radioSource);
var attemptEv = new RadioReceiveAttemptEvent(message, source, channel, radioSource); var attemptEv = new RadioReceiveAttemptEvent(message, source, channel, radioSource);
bool sentAtLeastOnce = false; var sentAtLeastOnce = false;
foreach (var radio in EntityQuery<ActiveRadioComponent>()) foreach (var radio in EntityQuery<ActiveRadioComponent>())
{ {
var ent = radio.Owner;
// TODO map/station/range checks? // TODO map/station/range checks?
if (!radio.Channels.Contains(channel.ID)) if (!radio.Channels.Contains(channel.ID))
continue; continue;
RaiseLocalEvent(radio.Owner, attemptEv); RaiseLocalEvent(ent, attemptEv);
if (attemptEv.Cancelled) if (attemptEv.Cancelled)
{ {
attemptEv.Uncancel(); attemptEv.Uncancel();
continue; continue;
} }
sentAtLeastOnce = true; sentAtLeastOnce = true;
RaiseLocalEvent(radio.Owner, ev); RaiseLocalEvent(ent, ev);
} }
if (!sentAtLeastOnce) if (!sentAtLeastOnce)
_popupSystem.PopupEntity(Loc.GetString("failed-to-send-message"), source, PopupType.MediumCaution); _popupSystem.PopupEntity(Loc.GetString("failed-to-send-message"), source, source, PopupType.MediumCaution);
if (name != Name(source)) if (name != Name(source))
_adminLogger.Add(LogType.Chat, LogImpact.Low, $"Radio message from {ToPrettyString(source):user} as {name} on {channel.LocalizedName}: {message}"); _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Radio message from {ToPrettyString(source):user} as {name} on {channel.LocalizedName}: {message}");