From 1de3db0903b8b65db4f49663f45b933d6163c076 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Tue, 3 Jan 2012 18:37:36 +1300 Subject: [PATCH] Don't take a NRE in GiveUnitCrateAction.GetSuitableCells if not Mobile --- OpenRA.Mods.RA/Crates/GiveUnitCrateAction.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenRA.Mods.RA/Crates/GiveUnitCrateAction.cs b/OpenRA.Mods.RA/Crates/GiveUnitCrateAction.cs index 386416874f..e80f77b278 100644 --- a/OpenRA.Mods.RA/Crates/GiveUnitCrateAction.cs +++ b/OpenRA.Mods.RA/Crates/GiveUnitCrateAction.cs @@ -28,6 +28,7 @@ namespace OpenRA.Mods.RA.Crates class GiveUnitCrateAction : CrateAction { GiveUnitCrateActionInfo Info; + public GiveUnitCrateAction(Actor self, GiveUnitCrateActionInfo info) : base(self, info) { Info = info; } @@ -61,7 +62,8 @@ namespace OpenRA.Mods.RA.Crates IEnumerable GetSuitableCells(int2 near) { - var mi = Rules.Info[Info.Unit].Traits.GetOrDefault(); + var mi = Rules.Info[Info.Unit].Traits.Get(); + for (var i = -1; i < 2; i++) for (var j = -1; j < 2; j++) if (mi.CanEnterCell(self.World, self.Owner, near + new int2(i, j), null, true))