From 5e032edd28fc3768231b63980f68d29f71456196 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Wed, 7 Oct 2020 17:46:49 +0100 Subject: [PATCH] Remove redundant BuildingInfluence checks. Buildings are already excluded by the ActorMap checks. --- OpenRA.Mods.Common/Traits/Air/Aircraft.cs | 3 --- OpenRA.Mods.Common/Traits/Crates/Crate.cs | 3 --- OpenRA.Mods.Common/Traits/World/CrateSpawner.cs | 3 +-- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Air/Aircraft.cs b/OpenRA.Mods.Common/Traits/Air/Aircraft.cs index ff42ee73ec..c5c2de806d 100644 --- a/OpenRA.Mods.Common/Traits/Air/Aircraft.cs +++ b/OpenRA.Mods.Common/Traits/Air/Aircraft.cs @@ -187,9 +187,6 @@ namespace OpenRA.Mods.Common.Traits if (!LandableTerrainTypes.Contains(type)) return false; - if (world.WorldActor.Trait().GetBuildingAt(cell) != null) - return false; - if (check == BlockedByActor.None) return true; diff --git a/OpenRA.Mods.Common/Traits/Crates/Crate.cs b/OpenRA.Mods.Common/Traits/Crates/Crate.cs index 244a71dee1..4691f771ca 100644 --- a/OpenRA.Mods.Common/Traits/Crates/Crate.cs +++ b/OpenRA.Mods.Common/Traits/Crates/Crate.cs @@ -63,9 +63,6 @@ namespace OpenRA.Mods.Common.Traits if (!CanExistInCell(world, cell)) return SubCell.Invalid; - if (world.WorldActor.Trait().GetBuildingAt(cell) != null) - return SubCell.Invalid; - if (check == BlockedByActor.None) return SubCell.FullCell; diff --git a/OpenRA.Mods.Common/Traits/World/CrateSpawner.cs b/OpenRA.Mods.Common/Traits/World/CrateSpawner.cs index db89add518..9376a6b3eb 100644 --- a/OpenRA.Mods.Common/Traits/World/CrateSpawner.cs +++ b/OpenRA.Mods.Common/Traits/World/CrateSpawner.cs @@ -180,8 +180,7 @@ namespace OpenRA.Mods.Common.Traits continue; // Don't drop on any actors - if (self.World.WorldActor.Trait().GetBuildingAt(p) != null - || self.World.ActorMap.GetActorsAt(p).Any()) + if (self.World.ActorMap.GetActorsAt(p).Any()) continue; return p;