From 8833e95f21f6e0b811ecef512ec7717caa19bb37 Mon Sep 17 00:00:00 2001 From: michaeldgg2 <119738087+michaeldgg2@users.noreply.github.com> Date: Sat, 14 Jun 2025 17:37:11 +0200 Subject: [PATCH] PBOG: remove the resource check and let IsCellBuildable() extension method handle it --- OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs b/OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs index c939416d9d..78cc5a7a22 100644 --- a/OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs +++ b/OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs @@ -88,7 +88,6 @@ namespace OpenRA.Mods.Common.Orders readonly World world; protected readonly ProductionQueue Queue; readonly PlaceBuildingInfo placeBuildingInfo; - readonly IResourceLayer resourceLayer; readonly Viewport viewport; readonly VariantWrapper[] variants; int variant; @@ -98,7 +97,6 @@ namespace OpenRA.Mods.Common.Orders Queue = queue; world = queue.Actor.World; placeBuildingInfo = queue.Actor.Owner.PlayerActor.Info.TraitInfo(); - resourceLayer = world.WorldActor.TraitOrDefault(); viewport = worldRenderer.Viewport; // Clear selection if using Left-Click Orders @@ -294,12 +292,7 @@ namespace OpenRA.Mods.Common.Orders { var isCloseEnough = buildingInfo.IsCloseEnoughToBase(world, world.LocalPlayer, actorInfo, topLeft); foreach (var t in buildingInfo.Tiles(topLeft)) - footprint.Add( - t, - MakeCellType( - isCloseEnough && - world.IsCellBuildable(t, actorInfo, buildingInfo) && - (resourceLayer == null || resourceLayer.GetResource(t).Type == null))); + footprint.Add(t, MakeCellType(isCloseEnough && world.IsCellBuildable(t, actorInfo, buildingInfo))); } return preview?.Render(wr, topLeft, footprint) ?? [];