From 689049cc12d3d3fefaba6265aa461f05aa28c011 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 16 Feb 2020 11:18:41 +0000 Subject: [PATCH] Fix NRE in ArmyUnit constructor. --- OpenRA.Mods.Common/Traits/Player/PlayerStatistics.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Player/PlayerStatistics.cs b/OpenRA.Mods.Common/Traits/Player/PlayerStatistics.cs index 2725e4a7c8..61996c3b82 100644 --- a/OpenRA.Mods.Common/Traits/Player/PlayerStatistics.cs +++ b/OpenRA.Mods.Common/Traits/Player/PlayerStatistics.cs @@ -181,10 +181,6 @@ namespace OpenRA.Mods.Common.Traits BuildableInfo = actorInfo.TraitInfoOrDefault(); TooltipInfo = actorInfo.TraitInfos().FirstOrDefault(info => info.EnabledByDefault); - ProductionQueueOrder = queues.Where(q => BuildableInfo.Queue.Contains(q.Type)) - .Select(q => q.DisplayOrder) - .MinByOrDefault(o => o); - var rsi = actorInfo.TraitInfoOrDefault(); if (BuildableInfo != null && rsi != null) @@ -194,6 +190,9 @@ namespace OpenRA.Mods.Common.Traits Icon.Play(BuildableInfo.Icon); IconPalette = BuildableInfo.IconPalette; BuildPaletteOrder = BuildableInfo.BuildPaletteOrder; + ProductionQueueOrder = queues.Where(q => BuildableInfo.Queue.Contains(q.Type)) + .Select(q => q.DisplayOrder) + .MinByOrDefault(o => o); } } }