From 8f0fb2491487dd1daa74c8111675ef7242a7349e Mon Sep 17 00:00:00 2001
From: Vera Aguilera Puerto <gradientvera@outlook.com>
Date: Sat, 5 Mar 2022 01:30:03 +0100
Subject: [PATCH] Move MapManager restart after deleting every entity with a
 for loop.

---
 Content.Server/GameTicking/GameTicker.RoundFlow.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index 0f9f96aea3..0b40af231d 100644
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -422,9 +422,7 @@ namespace Content.Server.GameTicking
                 unCastData.ContentData()?.WipeMind();
             }
 
-            _mapManager.Restart();
-
-            // Delete all remaining entities.
+            // Delete all entities.
             foreach (var entity in EntityManager.GetEntities().ToArray())
             {
                 // TODO: Maybe something less naive here?
@@ -432,6 +430,8 @@ namespace Content.Server.GameTicking
                 EntityManager.DeleteEntity(entity);
             }
 
+            _mapManager.Restart();
+
             _roleBanManager.Restart();
 
             // Clear up any game rules.