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

Merge pull request #10062 from RoosterDragon/seeds-bounds-check

Browse Source 
Prevent invalid cells checks in SeedsResource
This commit is contained in:
Matthias Mailänder
2015-11-22 08:04:13 +01:00
parent 172846fdb4 c4851a40cd
commit 4559949846
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Common/Traits/SeedsResource.cs
View File

@@ -65,7 +65,8 @@ namespace OpenRA.Mods.Common.Traits
{ {
var cell = Util.RandomWalk(self.Location, self.World.SharedRandom) var cell = Util.RandomWalk(self.Location, self.World.SharedRandom)
.Take(info.MaxRange) .Take(info.MaxRange)
.SkipWhile(p => resLayer.GetResource(p) == resourceType && resLayer.IsFull(p)) .SkipWhile(p => !self.World.Map.Contains(p) ||
(resLayer.GetResource(p) == resourceType && resLayer.IsFull(p)))
.Cast<CPos?>().FirstOrDefault(); .Cast<CPos?>().FirstOrDefault();
if (cell != null && resLayer.CanSpawnResourceAt(resourceType, cell.Value)) if (cell != null && resLayer.CanSpawnResourceAt(resourceType, cell.Value))