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

Fix NRE in ArmyUnit constructor.

Browse Source
This commit is contained in:
Paul Chote
2020-02-16 11:18:41 +00:00
committed by abcdefg30
parent 1485194ef3
commit 689049cc12
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Common/Traits/Player/PlayerStatistics.cs
View File

@@ -181,10 +181,6 @@ namespace OpenRA.Mods.Common.Traits
BuildableInfo = actorInfo.TraitInfoOrDefault<BuildableInfo>(); BuildableInfo = actorInfo.TraitInfoOrDefault<BuildableInfo>();
TooltipInfo = actorInfo.TraitInfos<TooltipInfo>().FirstOrDefault(info => info.EnabledByDefault); TooltipInfo = actorInfo.TraitInfos<TooltipInfo>().FirstOrDefault(info => info.EnabledByDefault);
ProductionQueueOrder = queues.Where(q => BuildableInfo.Queue.Contains(q.Type))
.Select(q => q.DisplayOrder)
.MinByOrDefault(o => o);
var rsi = actorInfo.TraitInfoOrDefault<RenderSpritesInfo>(); var rsi = actorInfo.TraitInfoOrDefault<RenderSpritesInfo>();
if (BuildableInfo != null && rsi != null) if (BuildableInfo != null && rsi != null)
@@ -194,6 +190,9 @@ namespace OpenRA.Mods.Common.Traits
Icon.Play(BuildableInfo.Icon); Icon.Play(BuildableInfo.Icon);
IconPalette = BuildableInfo.IconPalette; IconPalette = BuildableInfo.IconPalette;
BuildPaletteOrder = BuildableInfo.BuildPaletteOrder; BuildPaletteOrder = BuildableInfo.BuildPaletteOrder;
ProductionQueueOrder = queues.Where(q => BuildableInfo.Queue.Contains(q.Type))
.Select(q => q.DisplayOrder)
.MinByOrDefault(o => o);
} }
} }
} }