diff --git a/OpenRA.Game/Network/UnitOrders.cs b/OpenRA.Game/Network/UnitOrders.cs index 4a1d1d2818..7a88bd5c18 100644 --- a/OpenRA.Game/Network/UnitOrders.cs +++ b/OpenRA.Game/Network/UnitOrders.cs @@ -93,6 +93,15 @@ namespace OpenRA.Network case "StartGame": { + if (Game.modData.MapCache[orderManager.LobbyInfo.GlobalSettings.Map].Status != MapStatus.Available) + { + Game.Disconnect(); + Game.LoadShellMap(); + + // TODO: After adding a startup error dialog, notify the replay load failure. + break; + } + Game.AddChatLine(Color.White, "Server", "The game has started."); Game.StartGame(orderManager.LobbyInfo.GlobalSettings.Map, false); break;