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

Silently ignore bogus prerequisites instead of crashing. Fixes #4225.

Browse Source
This commit is contained in:
Paul Chote
2013-12-08 21:34:49 +13:00
parent 28cf6d36f4
commit e76dbcd4bf
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Mods.RA/Player/TechTree.cs
View File

@@ -63,10 +63,20 @@ namespace OpenRA.Mods.RA
return ret; return ret;
// Add buildables that provide prerequisites // Add buildables that provide prerequisites
foreach (var b in player.World.ActorsWithTrait<ITechTreePrerequisite>() var prereqs = player.World.ActorsWithTrait<ITechTreePrerequisite>()
.Where(a => a.Actor.IsInWorld && !a.Actor.IsDead() && a.Actor.Owner == player)) .Where(a => a.Actor.Owner == player && !a.Actor.IsDead() && a.Actor.IsInWorld);
foreach (var b in prereqs)
{
foreach (var p in b.Trait.ProvidesPrerequisites) foreach (var p in b.Trait.ProvidesPrerequisites)
{
// Ignore bogus prerequisites
if (p == null)
continue;
ret[p].Add(b.Actor); ret[p].Add(b.Actor);
}
}
// Add buildables that have a build limit set and are not already in the list // Add buildables that have a build limit set and are not already in the list
player.World.ActorsWithTrait<Buildable>() player.World.ActorsWithTrait<Buildable>()