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

Merge pull request #8470 from Mailaender/upgrade-nres

Browse Source 
Fixed NullReferenceExceptions in UpgradeActorRules
This commit is contained in:
Oliver Brakmann
2015-06-15 22:07:00 +02:00
parent 6e052d19d9 1bf2bfadb4
commit 78a1dadba0
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -369,14 +369,17 @@ namespace OpenRA.Mods.Common.UtilityCommands
// GiveUnitCrateAction and GiveMcvCrateAction were updated to allow multiple units // GiveUnitCrateAction and GiveMcvCrateAction were updated to allow multiple units
if (engineVersion < 20140723) if (engineVersion < 20140723)
{ {
if (depth == 2 && parentKey.Contains("GiveMcvCrateAction")) if (depth == 2 && !string.IsNullOrEmpty(parentKey))
{
if (parentKey.Contains("GiveMcvCrateAction"))
if (node.Key == "Unit") if (node.Key == "Unit")
node.Key = "Units"; node.Key = "Units";
if (depth == 2 && parentKey.Contains("GiveUnitCrateAction")) if (parentKey.Contains("GiveUnitCrateAction"))
if (node.Key == "Unit") if (node.Key == "Unit")
node.Key = "Units"; node.Key = "Units";
} }
}
// Power from Building was moved out into Power and ScalePowerWithHealth traits // Power from Building was moved out into Power and ScalePowerWithHealth traits
if (engineVersion < 20140823) if (engineVersion < 20140823)
@@ -1098,7 +1101,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
var chPal = nodeChPal != null && !string.IsNullOrEmpty(nodeChPal.Value.Value) ? nodeChPal.Value.Value : "effect"; var chPal = nodeChPal != null && !string.IsNullOrEmpty(nodeChPal.Value.Value) ? nodeChPal.Value.Value : "effect";
ge.Value.Nodes.Remove(nodeChPal); ge.Value.Nodes.Remove(nodeChPal);
if (upgrades != 0) if (upgrades != 0 && nodeUpgrades != null)
{ {
foreach (var nodeUpgrade in nodeUpgrades.Value.Nodes) foreach (var nodeUpgrade in nodeUpgrades.Value.Nodes)
nodeUpgrade.Value.Value = "rank" + (string.IsNullOrEmpty(nodeUpgrade.Value.Value) ? null : ", ") + nodeUpgrade.Value.Value; nodeUpgrade.Value.Value = "rank" + (string.IsNullOrEmpty(nodeUpgrade.Value.Value) ? null : ", ") + nodeUpgrade.Value.Value;
@@ -1120,7 +1123,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
} }
// Images from WithCrateBody was moved into RenderSprites // Images from WithCrateBody was moved into RenderSprites
if (engineVersion < 20150530) if (engineVersion < 20150608)
{ {
if (depth == 0) if (depth == 0)
{ {