From 9ee9de01b1812c2f17c044bbeba4f239c88c54b0 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 5 Oct 2013 23:28:09 +1300 Subject: [PATCH] Use cell positioning to look up resupply actors. Fixes #3901. FindActorsInBox only checks against the centre of actors, so testing two points is rarely going to work. --- OpenRA.Mods.RA/Activities/Rearm.cs | 2 +- OpenRA.Mods.RA/Air/Aircraft.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenRA.Mods.RA/Activities/Rearm.cs b/OpenRA.Mods.RA/Activities/Rearm.cs index a930e46409..e62abe851b 100644 --- a/OpenRA.Mods.RA/Activities/Rearm.cs +++ b/OpenRA.Mods.RA/Activities/Rearm.cs @@ -36,7 +36,7 @@ namespace OpenRA.Mods.RA.Activities { if (!limitedAmmo.GiveAmmo()) return NextActivity; - var hostBuilding = self.World.FindActorsInBox(self.CenterPosition, self.CenterPosition) + var hostBuilding = self.World.ActorMap.GetUnitsAt(self.Location) .FirstOrDefault(a => a.HasTrait()); if (hostBuilding != null) diff --git a/OpenRA.Mods.RA/Air/Aircraft.cs b/OpenRA.Mods.RA/Air/Aircraft.cs index ab88485cc6..a88af7990a 100755 --- a/OpenRA.Mods.RA/Air/Aircraft.cs +++ b/OpenRA.Mods.RA/Air/Aircraft.cs @@ -71,7 +71,7 @@ namespace OpenRA.Mods.RA.Air if (self.CenterPosition.Z != 0) return null; // not on the ground. - return self.World.FindActorsInBox(self.CenterPosition, self.CenterPosition) + return self.World.ActorMap.GetUnitsAt(self.Location) .FirstOrDefault(a => a.HasTrait()); }