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

Fix potential crashes in the upgrade rules

Browse Source
This commit is contained in:
abcdefg30
2015-11-28 12:42:49 +01:00
parent abed25d293
commit 18b9022915
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
View File

@@ -1679,7 +1679,15 @@ namespace OpenRA.Mods.Common.UtilityCommands
var otherNodes = nodes; var otherNodes = nodes;
var inherits = new Func<string, bool>(traitName => node.Value.Nodes.Where(n => n.Key.StartsWith("Inherits")) var inherits = new Func<string, bool>(traitName => node.Value.Nodes.Where(n => n.Key.StartsWith("Inherits"))
.Any(inh => otherNodes.First(n => n.Key.StartsWith(inh.Value.Value)).Value.Nodes.Any(n => n.Key.StartsWith(traitName)))); .Any(inh =>
{
var otherNode = otherNodes.FirstOrDefault(n => n.Key.StartsWith(inh.Value.Value));
if (otherNode == null)
return false;
return otherNode.Value.Nodes.Any(n => n.Key.StartsWith(traitName));
}));
// For actors that have or inherit a TargetableUnit, disable the trait while parachuting // For actors that have or inherit a TargetableUnit, disable the trait while parachuting
var tu = node.Value.Nodes.FirstOrDefault(n => n.Key.StartsWith("TargetableUnit")); var tu = node.Value.Nodes.FirstOrDefault(n => n.Key.StartsWith("TargetableUnit"));
@@ -2295,7 +2303,15 @@ namespace OpenRA.Mods.Common.UtilityCommands
{ {
var otherNodes = nodes; var otherNodes = nodes;
var inherits = new Func<string, bool>(traitName => node.Value.Nodes.Where(n => n.Key.StartsWith("Inherits")) var inherits = new Func<string, bool>(traitName => node.Value.Nodes.Where(n => n.Key.StartsWith("Inherits"))
.Any(inh => otherNodes.First(n => n.Key.StartsWith(inh.Value.Value)).Value.Nodes.Any(n => n.Key.StartsWith(traitName)))); .Any(inh =>
{
var otherNode = otherNodes.FirstOrDefault(n => n.Key.StartsWith(inh.Value.Value));
if (otherNode == null)
return false;
return otherNode.Value.Nodes.Any(n => n.Key.StartsWith(traitName));
}));
var target = node.Value.Nodes.FirstOrDefault(n => n.Key.StartsWith("-AutoTarget")); var target = node.Value.Nodes.FirstOrDefault(n => n.Key.StartsWith("-AutoTarget"));
if (target != null) if (target != null)