Merge remote-tracking branch 'origin/master'

Content.Server/GameTicking/GameTicker.RoundFlow.cs

@@ -453,8 +453,6 @@ namespace Content.Server.GameTicking
 
             _replayRoundPlayerInfo = listOfPlayerInfoFinal;
             _replayRoundText = roundEndText;
-
-            RaiseLocalEvent(new RoundEndedEvent(RoundId, roundDuration)); // WD-EDIT
         }
 
         private async void SendRoundEndDiscordMessage()
@@ -505,7 +503,9 @@ namespace Content.Server.GameTicking
             _sawmill.Info("Restarting round!");
 
             SendServerMessage(Loc.GetString("game-ticker-restart-round"));
-            RaiseLocalEvent(new RealRoundEndedEvent());
+
+            RaiseLocalEvent(new RealRoundEndedEvent()); // WD
+            RaiseLocalEvent(new RoundEndedEvent(RoundId, RoundDuration())); // WD
 
             RoundNumberMetric.Inc();
 

Resources/Changelog/ChangelogWhite.yml

@@ -5500,3 +5500,13 @@
   id: 355
   time: '2024-07-05T15:01:37.0000000+00:00'
   url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/418
+- author: ThereDrD
+  changes:
+  - message: "\u0414\u0438\u0441\u043A\u043E\u0440\u0434-\u0441\u043E\u043E\u0431\u0449\
+      \u0435\u043D\u0438\u0435 \u043E \u043A\u043E\u043D\u0446\u0435 \u0440\u0430\u0443\
+      \u043D\u0434\u0430 \u0442\u0435\u043F\u0435\u0440\u044C \u043F\u0440\u0438\u0445\
+      \u043E\u0434\u0438\u0442."
+    type: Fix
+  id: 356
+  time: '2024-07-05T17:43:49.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/422