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

Fix Repairable not accounting for multiple ICallForTransport traits

Browse Source
This commit is contained in:
abcdefg30
2018-02-22 00:57:29 +01:00
committed by Paul Chote
parent c6fee041b1
commit 7ae6326f2a
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.Common/Traits/Repairable.cs
View File

@@ -142,15 +142,13 @@ namespace OpenRA.Mods.Common.Traits
static void TryCallTransport(Actor self, Target target, Activity nextActivity) static void TryCallTransport(Actor self, Target target, Activity nextActivity)
{ {
var transport = self.TraitOrDefault<ICallForTransport>();
if (transport == null)
return;
var targetCell = self.World.Map.CellContaining(target.CenterPosition); var targetCell = self.World.Map.CellContaining(target.CenterPosition);
if ((self.CenterPosition - target.CenterPosition).LengthSquared < transport.MinimumDistance.LengthSquared) var delta = (self.CenterPosition - target.CenterPosition).LengthSquared;
return; var transports = self.TraitsImplementing<ICallForTransport>()
.Where(t => t.MinimumDistance.LengthSquared < delta);
transport.RequestTransport(self, targetCell, nextActivity); foreach (var t in transports)
t.RequestTransport(self, targetCell, nextActivity);
} }
} }
} }