From: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> Date: Sat, 4 May 2024 00:03:52 +0000 (-0400) Subject: Fix some gamerules' round summary not working (#27654) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=6ecbf0a04ce3ebaa6c74e144a8fb64ddf3223b43;p=space-station-14.git Fix some gamerules' round summary not working (#27654) Update GameRuleSystem.cs --- diff --git a/Content.Server/GameTicking/Rules/GameRuleSystem.cs b/Content.Server/GameTicking/Rules/GameRuleSystem.cs index c167ae7b6c..0ff9b3bbbb 100644 --- a/Content.Server/GameTicking/Rules/GameRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/GameRuleSystem.cs @@ -26,7 +26,7 @@ public abstract partial class GameRuleSystem : EntitySystem where T : ICompon SubscribeLocalEvent(OnGameRuleAdded); SubscribeLocalEvent(OnGameRuleStarted); SubscribeLocalEvent(OnGameRuleEnded); - SubscribeLocalEvent(OnRoundEndTextAppend); + SubscribeLocalEvent(OnRoundEndTextAppend); } private void OnStartAttempt(RoundStartAttemptEvent args) @@ -70,11 +70,16 @@ public abstract partial class GameRuleSystem : EntitySystem where T : ICompon Ended(uid, component, ruleData, args); } - private void OnRoundEndTextAppend(Entity ent, ref RoundEndTextAppendEvent args) + private void OnRoundEndTextAppend(RoundEndTextAppendEvent ev) { - if (!TryComp(ent, out var ruleData)) - return; - AppendRoundEndText(ent, ent, ruleData, ref args); + var query = AllEntityQuery(); + while (query.MoveNext(out var uid, out var comp)) + { + if (!TryComp(uid, out var ruleData)) + return; + + AppendRoundEndText(uid, comp, ruleData, ref ev); + } } ///