diff --git a/OpenRA.Mods.RA/Widgets/PowerBinWidget.cs b/OpenRA.Mods.RA/Widgets/PowerBinWidget.cs index 7305370b14..3c1ad04775 100755 --- a/OpenRA.Mods.RA/Widgets/PowerBinWidget.cs +++ b/OpenRA.Mods.RA/Widgets/PowerBinWidget.cs @@ -27,12 +27,16 @@ namespace OpenRA.Mods.RA.Widgets string powerCollection; readonly string RadarBin = "INGAME_RADAR_BIN"; - + readonly PowerManager power; readonly World world; + [ObjectCreator.UseCtor] public PowerBinWidget( [ObjectCreator.Param] World world ) { this.world = world; + + if (world.LocalPlayer != null) + power = world.LocalPlayer.PlayerActor.Trait(); } static Color GetPowerColor(PowerManager pm) @@ -50,8 +54,6 @@ namespace OpenRA.Mods.RA.Widgets powerCollection = "power-" + world.LocalPlayer.Country.Race; - var power = world.LocalPlayer.PlayerActor.Trait(); - // Nothing to draw if (power.PowerProvided == 0 && power.PowerDrained == 0) return;