epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove LobbyDefaults from mod.yaml.

Browse Source
This commit is contained in:
Paul Chote
2016-02-29 23:17:21 +00:00
parent d4f8fe1666
commit 8017844a15
9 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Manifest.cs
View File

@@ -44,7 +44,6 @@ namespace OpenRA
public readonly IReadOnlyDictionary<string, string> Packages;
public readonly IReadOnlyDictionary<string, string> MapFolders;
public readonly MiniYaml LoadScreen;
public readonly MiniYaml LobbyDefaults;
public readonly Dictionary<string, string> RequiresMods;
public readonly Dictionary<string, Pair<string, int>> Fonts;
@@ -98,9 +97,6 @@ namespace OpenRA
if (!yaml.TryGetValue("LoadScreen", out LoadScreen))
throw new InvalidDataException("`LoadScreen` section is not defined.");
if (!yaml.TryGetValue("LobbyDefaults", out LobbyDefaults))
throw new InvalidDataException("`LobbyDefaults` section is not defined.");
Fonts = yaml["Fonts"].ToDictionary(my =>
{
var nd = my.ToDictionary();

5
OpenRA.Game/Server/Server.cs
View File

@@ -154,8 +154,6 @@ namespace OpenRA.Server
}
};
FieldLoader.Load(LobbyInfo.GlobalSettings, modData.Manifest.LobbyDefaults);
new Thread(_ =>
{
foreach (var t in serverTraits.WithInterface<INotifyServerStart>())
@@ -608,10 +606,7 @@ namespace OpenRA.Server
DispatchOrders(toDrop, frame, new byte[] { 0xbf });
if (!Conns.Any())
{
FieldLoader.Load(LobbyInfo.GlobalSettings, ModData.Manifest.LobbyDefaults);
TempBans.Clear();
}
if (Conns.Any() || LobbyInfo.GlobalSettings.Dedicated)
SyncLobbyClients();