From 723c2d82c8dbd26ab713e437cd8ce94e437ed636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 31 May 2015 15:58:55 +0200 Subject: [PATCH] fix a possible NRE --- OpenRA.Mods.Common/Activities/Air/FlyAttack.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenRA.Mods.Common/Activities/Air/FlyAttack.cs b/OpenRA.Mods.Common/Activities/Air/FlyAttack.cs index 806efaba29..a071b0406c 100644 --- a/OpenRA.Mods.Common/Activities/Air/FlyAttack.cs +++ b/OpenRA.Mods.Common/Activities/Air/FlyAttack.cs @@ -52,7 +52,7 @@ namespace OpenRA.Mods.Common.Activities return NextActivity; // TODO: This should fire each weapon at its maximum range - if (target.IsInRange(self.CenterPosition, attackPlane.Armaments.Select(a => a.Weapon.MinRange).Min())) + if (attackPlane != null && target.IsInRange(self.CenterPosition, attackPlane.Armaments.Select(a => a.Weapon.MinRange).Min())) inner = Util.SequenceActivities(new FlyTimed(ticksUntilTurn, self), new Fly(self, target), new FlyTimed(ticksUntilTurn, self)); else inner = Util.SequenceActivities(new Fly(self, target), new FlyTimed(ticksUntilTurn, self));