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

Fix PrimaryBuilding changing the status of and from disabled queues

Browse Source
This commit is contained in:
abcdefg30
2018-08-04 15:47:23 +02:00
committed by abcdefg30
parent 272d9b99fd
commit f968b169ad
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Traits/Buildings/PrimaryBuilding.cs
View File

@@ -94,7 +94,8 @@ namespace OpenRA.Mods.Common.Traits
{
// Cancel existing primaries
// TODO: THIS IS SHIT
var queues = Info.ProductionQueues.Length == 0 ? self.Info.TraitInfos<ProductionInfo>().SelectMany(pi => pi.Produces) : Info.ProductionQueues;
var queues = Info.ProductionQueues.Length == 0 ? self.TraitsImplementing<Production>()
.Where(t => !t.IsTraitDisabled).SelectMany(pi => pi.Info.Produces) : Info.ProductionQueues;
foreach (var q in queues)
{
foreach (var b in self.World
@@ -103,7 +104,7 @@ namespace OpenRA.Mods.Common.Traits
a.Actor != self &&
a.Actor.Owner == self.Owner &&
a.Trait.IsPrimary &&
a.Actor.Info.TraitInfos<ProductionInfo>().Any(pi => pi.Produces.Contains(q))))
a.Actor.TraitsImplementing<Production>().Where(p => !p.IsTraitDisabled).Any(pi => pi.Info.Produces.Contains(q))))
b.Trait.SetPrimaryProducer(b.Actor, false);
}