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

Updated AcceptsOrder check to be more readable

Browse Source 
This hopefully also fixes handling of multiple enabled
RejectsOrders traits.
This commit is contained in:
reaperrr
2019-06-30 12:18:18 +02:00
committed by RoosterDragon
parent 465ee97090
commit 694680720e
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Traits/RejectsOrders.cs
View File

@@ -40,8 +40,14 @@ namespace OpenRA.Mods.Common.Traits
{
public static bool AcceptsOrder(this Actor self, string orderString)
{
var r = self.TraitsImplementing<RejectsOrders>().Where(Exts.IsTraitEnabled).ToList();
return !r.Any() || r.Any(t => t.Reject.Any() && !t.Reject.Contains(orderString)) || r.Any(t => t.Except.Contains(orderString));
var rejectsOrdersTraits = self.TraitsImplementing<RejectsOrders>().Where(Exts.IsTraitEnabled).ToArray();
if (!rejectsOrdersTraits.Any())
return true;
var reject = rejectsOrdersTraits.SelectMany(t => t.Reject);
var except = rejectsOrdersTraits.SelectMany(t => t.Except);
return except.Contains(orderString) || (reject.Any() && !reject.Contains(orderString));
}
}
}