Fix collectors dropping now enemy owned supply centers after capture

MustaphaTR · Jun 5, 2018 · fc758b7 · fc758b7
1 parent 35cd61f
commit fc758b7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/OpenRA.Mods.Gen/Activities/Supply/DeliverGoods.cs b/OpenRA.Mods.Gen/Activities/Supply/DeliverGoods.cs
@@ -32,7 +32,7 @@ public override Activity Tick(Actor self)
             if (IsCanceled || NextActivity != null)
                 return NextActivity;
 
-            if (collector.deliveryBuilding == null || !collector.deliveryBuilding.IsInWorld)
+            if (collector.deliveryBuilding == null || !collector.deliveryBuilding.IsInWorld || !collectorInfo.DeliveryStances.HasStance(self.Owner.Stances[collector.deliveryBuilding.Owner]))
             {
 				collector.deliveryBuilding = collector.ClosestDeliveryBuilding(self);
             }

diff --git a/OpenRA.Mods.Gen/Activities/Supply/FindGoods.cs b/OpenRA.Mods.Gen/Activities/Supply/FindGoods.cs
@@ -32,7 +32,7 @@ public override Activity Tick(Actor self)
             if (IsCanceled || NextActivity != null)
                 return NextActivity;
 
-            if (collector.collectionBuilding == null || !collector.collectionBuilding.IsInWorld || collector.collectionBuilding.Trait<SupplyDock>().IsEmpty)
+            if (collector.collectionBuilding == null || !collector.collectionBuilding.IsInWorld || !collectorInfo.CollectionStances.HasStance(self.Owner.Stances[collector.collectionBuilding.Owner]) || collector.collectionBuilding.Trait<SupplyDock>().IsEmpty)
             {
 				collector.collectionBuilding = collector.ClosestTradeBuilding(self);
             }