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

Fix production exit desync.

Browse Source
This commit is contained in:
Paul Chote
2020-11-27 22:36:11 +00:00
committed by abcdefg30
parent d35768e0f9
commit 3b1f4ba07f
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Common/Traits/Buildings/Exit.cs
View File

@@ -48,9 +48,14 @@ namespace OpenRA.Mods.Common.Traits
{ {
public static Exit NearestExitOrDefault(this Actor actor, WPos pos, string productionType = null, Func<Exit, bool> p = null) public static Exit NearestExitOrDefault(this Actor actor, WPos pos, string productionType = null, Func<Exit, bool> p = null)
{ {
// The .ToList() is required to work around a bug/unexpected behaviour in mono, where
// the ThenBy clause makes the FirstOrDefault behave differently than under .NET.
// This is important because p may have side-effects that trigger a desync if not
// called on the same exits in the same order!
var all = Exits(actor, productionType) var all = Exits(actor, productionType)
.OrderBy(e => e.Info.Priority) .OrderBy(e => e.Info.Priority)
.ThenBy(e => (actor.CenterPosition + e.Info.SpawnOffset - pos).Length); .ThenBy(e => (actor.CenterPosition + e.Info.SpawnOffset - pos).Length)
.ToList();
return p != null ? all.FirstOrDefault(p) : all.FirstOrDefault(); return p != null ? all.FirstOrDefault(p) : all.FirstOrDefault();
} }