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

Fix some announcements code (#16585)

Browse Source
This commit is contained in:
metalgearsloth
2023-05-21 20:06:05 +10:00
committed by GitHub
parent 48ad2e7d22
commit 8edfedfba5
3 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Content.Server/GameTicking/GameTicker.RoundFlow.cs
View File

@@ -524,19 +524,18 @@ namespace Content.Server.GameTicking
{
if (Preset == null) return;
foreach (var proto in _prototypeManager.EnumeratePrototypes<RoundAnnouncementPrototype>())
{
if (!proto.GamePresets.Contains(Preset.ID)) continue;
var options = _prototypeManager.EnumeratePrototypes<RoundAnnouncementPrototype>().ToList();
if (proto.Message != null)
_chatSystem.DispatchGlobalAnnouncement(Loc.GetString(proto.Message), playSound: true);
if (options.Count == 0)
return;
if (proto.Sound != null)
SoundSystem.Play(proto.Sound.GetSound(), Filter.Broadcast());
var proto = _robustRandom.Pick(options);
// Only play one because A
break;
}
if (proto.Message != null)
_chatSystem.DispatchGlobalAnnouncement(Loc.GetString(proto.Message), playSound: true);
if (proto.Sound != null)
SoundSystem.Play(proto.Sound.GetSound(), Filter.Broadcast());
}
}