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

Fix a crash when refineries share a cell.

Browse Source
This commit is contained in:
Matthias Mailänder
2020-09-18 20:10:18 +02:00
committed by abcdefg30
parent 7a7393b9f0
commit 7e992d44c8
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Mods.Common/Traits/Harvester.cs
View File

@@ -174,25 +174,25 @@ namespace OpenRA.Mods.Common.Traits
public Actor ClosestProc(Actor self, Actor ignore) public Actor ClosestProc(Actor self, Actor ignore)
{ {
// Find all refineries and their occupancy count: // Find all refineries and their occupancy count:
var refs = self.World.ActorsWithTrait<IAcceptResources>() var refineries = self.World.ActorsWithTrait<IAcceptResources>()
.Where(r => r.Actor != ignore && r.Actor.Owner == self.Owner && IsAcceptableProcType(r.Actor)) .Where(r => r.Actor != ignore && r.Actor.Owner == self.Owner && IsAcceptableProcType(r.Actor))
.Select(r => new .Select(r => new
{ {
Location = r.Actor.Location + r.Trait.DeliveryOffset, Location = r.Actor.Location + r.Trait.DeliveryOffset,
Actor = r.Actor, Actor = r.Actor,
Occupancy = self.World.ActorsHavingTrait<Harvester>(h => h.LinkedProc == r.Actor).Count() Occupancy = self.World.ActorsHavingTrait<Harvester>(h => h.LinkedProc == r.Actor).Count()
}).ToDictionary(r => r.Location); }).ToLookup(r => r.Location);
// Start a search from each refinery's delivery location: // Start a search from each refinery's delivery location:
List<CPos> path; List<CPos> path;
using (var search = PathSearch.FromPoints(self.World, mobile.Locomotor, self, refs.Values.Select(r => r.Location), self.Location, BlockedByActor.None) using (var search = PathSearch.FromPoints(self.World, mobile.Locomotor, self, refineries.Select(r => r.Key), self.Location, BlockedByActor.None)
.WithCustomCost(loc => .WithCustomCost(location =>
{ {
if (!refs.ContainsKey(loc)) if (!refineries.Contains(location))
return 0; return 0;
var occupancy = refs[loc].Occupancy; var occupancy = refineries[location].First().Occupancy;
// Too many harvesters clogs up the refinery's delivery location: // Too many harvesters clogs up the refinery's delivery location:
if (occupancy >= Info.MaxUnloadQueue) if (occupancy >= Info.MaxUnloadQueue)
@@ -204,7 +204,7 @@ namespace OpenRA.Mods.Common.Traits
path = self.World.WorldActor.Trait<IPathFinder>().FindPath(search); path = self.World.WorldActor.Trait<IPathFinder>().FindPath(search);
if (path.Count != 0) if (path.Count != 0)
return refs[path.Last()].Actor; return refineries[path.Last()].First().Actor;
return null; return null;
} }