From 39c10e76e172149085e9925a337fb0e7bdbea045 Mon Sep 17 00:00:00 2001 From: ScottNZ Date: Sat, 8 Nov 2014 23:26:05 +1300 Subject: [PATCH] Fix Parachutable to work for tank drops --- OpenRA.Mods.RA/Parachutable.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OpenRA.Mods.RA/Parachutable.cs b/OpenRA.Mods.RA/Parachutable.cs index b59d89dbe9..5a91bd1d74 100644 --- a/OpenRA.Mods.RA/Parachutable.cs +++ b/OpenRA.Mods.RA/Parachutable.cs @@ -69,7 +69,7 @@ namespace OpenRA.Mods.RA if (!info.KilledOnImpassableTerrain) return; - if (positionable.CanEnterCell(self.Location)) + if (positionable.CanEnterCell(self.Location, self)) return; var terrain = self.World.Map.GetTerrainInfo(self.Location); @@ -79,7 +79,8 @@ namespace OpenRA.Mods.RA var sequence = terrain.IsWater ? info.WaterCorpseSequence : info.GroundCorpseSequence; var palette = terrain.IsWater ? info.WaterCorpsePalette : info.GroundCorpsePalette; - self.World.AddFrameEndTask(w => w.Add(new Explosion(w, self.OccupiesSpace.CenterPosition, sequence, palette))); + if (sequence != null && palette != null) + self.World.AddFrameEndTask(w => w.Add(new Explosion(w, self.OccupiesSpace.CenterPosition, sequence, palette))); self.Kill(self); }