Revert "Load Maps on Round Start, not Round Restart (#6930)" (#6945)

This reverts commit 650b8b6600.

Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs

@@ -234,6 +234,8 @@ public sealed class AddTests : ContentIntegrationTest
         await server.WaitIdleAsync();
 
         var sDatabase = server.ResolveDependency<IServerDbManager>();
+        var sEntities = server.ResolveDependency<IEntityManager>();
+        var sMaps = server.ResolveDependency<IMapManager>();
         var sSystems = server.ResolveDependency<IEntitySystemManager>();
 
         var sAdminLogSystem = sSystems.GetEntitySystem<AdminLogSystem>();
@@ -243,7 +245,10 @@ public sealed class AddTests : ContentIntegrationTest
 
         await server.WaitPost(() =>
         {
-            sAdminLogSystem.Add(LogType.Unknown, $"test log: {guid}");
+            var coordinates = GetMainEntityCoordinates(sMaps);
+            var entity = sEntities.SpawnEntity(null, coordinates);
+
+            sAdminLogSystem.Add(LogType.Unknown, $"{entity} test log: {guid}");
         });
 
         await server.WaitPost(() =>
@@ -280,6 +285,7 @@ public sealed class AddTests : ContentIntegrationTest
         {
             var root = json.RootElement;
 
+            Assert.That(root.TryGetProperty("entity", out _), Is.True);
             Assert.That(root.TryGetProperty("guid", out _), Is.True);
 
             json.Dispose();

Content.Server/GameTicking/GameTicker.RoundFlow.cs

@@ -190,8 +190,6 @@ namespace Content.Server.GameTicking
 
                 SendServerMessage(Loc.GetString("game-ticker-start-round"));
 
-                LoadMaps();
-
                 StartGamePresetRules();
 
                 RoundLengthMetric.Set(0);
@@ -375,6 +373,7 @@ namespace Content.Server.GameTicking
             RunLevel = GameRunLevel.PreRoundLobby;
             LobbySong = _robustRandom.Pick(_lobbyMusicCollection.PickFiles).ToString();
             ResettingCleanup();
+            LoadMaps();
 
             if (!LobbyEnabled)
             {
@@ -412,18 +411,18 @@ namespace Content.Server.GameTicking
                 unCastData.ContentData()?.WipeMind();
             }
 
-            _startingRound = false;
-
-            _mapManager.Restart();
-
-            // Delete all remaining entities.
-            foreach (var entity in EntityManager.GetEntities().ToArray())
+            // Delete all entities.
+            foreach (var entity in EntityManager.GetEntities().ToList())
             {
                 // TODO: Maybe something less naive here?
                 // FIXME: Actually, definitely.
                 EntityManager.DeleteEntity(entity);
             }
 
+            _startingRound = false;
+
+            _mapManager.Restart();
+
             _roleBanManager.Restart();
 
             // Clear up any game rules.