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

Fix map-specific factions remaining selected when changing map.

Browse Source
This commit is contained in:
Paul Chote
2020-04-15 14:21:09 +01:00
committed by abcdefg30
parent 429dbe3e0c
commit 33f3038316
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
View File

@@ -398,8 +398,17 @@ namespace OpenRA.Mods.Common.Server
LoadMapSettings(server, server.LobbyInfo.GlobalSettings, server.Map.Rules); LoadMapSettings(server, server.LobbyInfo.GlobalSettings, server.Map.Rules);
// Reset client states // Reset client states
var selectableFactions = server.Map.Rules.Actors["world"].TraitInfos<FactionInfo>()
.Where(f => f.Selectable)
.Select(f => f.InternalName)
.ToList();
foreach (var c in server.LobbyInfo.Clients) foreach (var c in server.LobbyInfo.Clients)
{
c.State = Session.ClientState.Invalid; c.State = Session.ClientState.Invalid;
if (!selectableFactions.Contains(c.Faction))
c.Faction = "Random";
}
// Reassign players into new slots based on their old slots: // Reassign players into new slots based on their old slots:
// - Observers remain as observers // - Observers remain as observers