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

Use another plug location for placing plugs on a building when current plug location is already blocked

Browse Source
This commit is contained in:
abc013
2019-10-11 19:02:55 +02:00
committed by abcdefg30
parent ba2d2299d9
commit c4f48ad521
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs
View File

@@ -229,7 +229,7 @@ namespace OpenRA.Mods.Common.Orders
return false; return false;
var location = host.Location; var location = host.Location;
return host.TraitsImplementing<Pluggable>().Any(p => location + p.Info.Offset == cell && p.AcceptsPlug(host, plug.Type)); return host.TraitsImplementing<Pluggable>().Any(p => p.AcceptsPlug(host, plug.Type));
} }
IEnumerable<IRenderable> IOrderGenerator.Render(WorldRenderer wr, World world) { yield break; } IEnumerable<IRenderable> IOrderGenerator.Render(WorldRenderer wr, World world) { yield break; }

7
OpenRA.Mods.Common/Traits/Player/PlaceBuilding.cs
View File

@@ -144,8 +144,11 @@ namespace OpenRA.Mods.Common.Traits
return; return;
var location = host.Location; var location = host.Location;
var pluggable = host.TraitsImplementing<Pluggable>() var pluggableLocations = host.TraitsImplementing<Pluggable>()
.FirstOrDefault(p => location + p.Info.Offset == targetLocation && p.AcceptsPlug(host, plugInfo.Type)); .Where(p => p.AcceptsPlug(host, plugInfo.Type));
var pluggable = pluggableLocations.FirstOrDefault(p => location + p.Info.Offset == targetLocation)
?? pluggableLocations.FirstOrDefault();
if (pluggable == null) if (pluggable == null)
return; return;