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

Don't take a NRE in GiveUnitCrateAction.GetSuitableCells if not Mobile

Browse Source
This commit is contained in:
Chris Forbes
2012-01-03 18:37:36 +13:00
parent 965fe88755
commit 1de3db0903
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.RA/Crates/GiveUnitCrateAction.cs
View File

@@ -28,6 +28,7 @@ namespace OpenRA.Mods.RA.Crates
class GiveUnitCrateAction : CrateAction class GiveUnitCrateAction : CrateAction
{ {
GiveUnitCrateActionInfo Info; GiveUnitCrateActionInfo Info;
public GiveUnitCrateAction(Actor self, GiveUnitCrateActionInfo info) public GiveUnitCrateAction(Actor self, GiveUnitCrateActionInfo info)
: base(self, info) { Info = info; } : base(self, info) { Info = info; }
@@ -61,7 +62,8 @@ namespace OpenRA.Mods.RA.Crates
IEnumerable<int2> GetSuitableCells(int2 near) IEnumerable<int2> GetSuitableCells(int2 near)
{ {
var mi = Rules.Info[Info.Unit].Traits.GetOrDefault<MobileInfo>(); var mi = Rules.Info[Info.Unit].Traits.Get<MobileInfo>();
for (var i = -1; i < 2; i++) for (var i = -1; i < 2; i++)
for (var j = -1; j < 2; j++) for (var j = -1; j < 2; j++)
if (mi.CanEnterCell(self.World, self.Owner, near + new int2(i, j), null, true)) if (mi.CanEnterCell(self.World, self.Owner, near + new int2(i, j), null, true))