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

Fix a crash in the TSResourceLayer neighbour validation

Browse Source
This commit is contained in:
abcdefg30
2021-11-02 23:14:07 +01:00
committed by reaperrr
parent 430c7a4d7d
commit 31cec0c17f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.Cnc/Traits/World/TSResourceLayer.cs
View File

@@ -74,6 +74,9 @@ namespace OpenRA.Mods.Cnc.Traits
bool IsValidResourceNeighbour(CPos cell, CPos neighbour) bool IsValidResourceNeighbour(CPos cell, CPos neighbour)
{ {
if (!Map.Contains(neighbour))
return false;
// Non-vein resources are not allowed in the cardinal neighbours to // Non-vein resources are not allowed in the cardinal neighbours to
// an already existing vein cell // an already existing vein cell
return Content[neighbour].Type != info.VeinType; return Content[neighbour].Type != info.VeinType;
@@ -81,6 +84,9 @@ namespace OpenRA.Mods.Cnc.Traits
bool IsValidVeinNeighbour(CPos cell, CPos neighbour) bool IsValidVeinNeighbour(CPos cell, CPos neighbour)
{ {
if (!Map.Contains(neighbour))
return false;
// Cell is automatically valid if it contains a veinhole actor // Cell is automatically valid if it contains a veinhole actor
if (veinholeCells.Contains(neighbour)) if (veinholeCells.Contains(neighbour))
return true; return true;
@@ -112,8 +118,7 @@ namespace OpenRA.Mods.Cnc.Traits
// Ensure there is space for the vein border tiles (not needed on ramps) // Ensure there is space for the vein border tiles (not needed on ramps)
var check = resourceType == info.VeinType ? (Func<CPos, CPos, bool>)IsValidVeinNeighbour : IsValidResourceNeighbour; var check = resourceType == info.VeinType ? (Func<CPos, CPos, bool>)IsValidVeinNeighbour : IsValidResourceNeighbour;
var blockedByNeighbours = Map.Ramp[cell] == 0 && !Common.Util.ExpandFootprint(cell, false) var blockedByNeighbours = Map.Ramp[cell] == 0 && !Common.Util.ExpandFootprint(cell, false).All(c => check(cell, c));
.All(c => check(cell, c));
return !blockedByNeighbours && (resourceType == info.VeinType || !BuildingInfluence.AnyBuildingAt(cell)); return !blockedByNeighbours && (resourceType == info.VeinType || !BuildingInfluence.AnyBuildingAt(cell));
} }