From e4faa6b0f07f4c252772867562c56bef78ed2f08 Mon Sep 17 00:00:00 2001
From: Paul Chote <pchote@users.noreply.github.com>
Date: Wed, 7 Oct 2020 17:52:22 +0100
Subject: [PATCH] Remove BuildingInfluence from Aircraft.

---
 OpenRA.Mods.Common/Traits/Air/Aircraft.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/OpenRA.Mods.Common/Traits/Air/Aircraft.cs b/OpenRA.Mods.Common/Traits/Air/Aircraft.cs
index c5c2de806d..dad6586097 100644
--- a/OpenRA.Mods.Common/Traits/Air/Aircraft.cs
+++ b/OpenRA.Mods.Common/Traits/Air/Aircraft.cs
@@ -1239,7 +1239,6 @@ namespace OpenRA.Mods.Common.Traits
 		public class AircraftMoveOrderTargeter : IOrderTargeter
 		{
 			readonly Aircraft aircraft;
-			readonly BuildingInfluence bi;
 
 			public string OrderID { get; protected set; }
 			public int OrderPriority { get { return 4; } }
@@ -1248,7 +1247,6 @@ namespace OpenRA.Mods.Common.Traits
 			public AircraftMoveOrderTargeter(Aircraft aircraft)
 			{
 				this.aircraft = aircraft;
-				bi = aircraft.self.World.WorldActor.TraitOrDefault<BuildingInfluence>();
 				OrderID = "Move";
 			}
 
@@ -1273,8 +1271,10 @@ namespace OpenRA.Mods.Common.Traits
 				// selection for left-mouse orders
 				if (modifiers.HasModifier(TargetModifiers.ForceMove) && aircraft.Info.CanForceLand)
 				{
-					var building = bi.GetBuildingAt(location);
-					if (building == null || building.TraitOrDefault<Selectable>() == null || aircraft.CanLand(location, blockedByMobile: false))
+					var buildingAtLocation = self.World.ActorMap.GetActorsAt(location)
+						.Any(a => a.TraitOrDefault<Building>() != null && a.TraitOrDefault<Selectable>() != null);
+
+					if (!buildingAtLocation || aircraft.CanLand(location, blockedByMobile: false))
 						OrderID = "Land";
 				}