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

Merge pull request #7102 from ScottNZ/parachutable

Browse Source 
Fixes #7101
This commit is contained in:
Matthias Mailänder
2014-12-13 08:14:23 +01:00
parent e353c93b76 39c10e76e1
commit 5da5bce405
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.RA/Parachutable.cs
View File

@@ -69,7 +69,7 @@ namespace OpenRA.Mods.RA
if (!info.KilledOnImpassableTerrain) if (!info.KilledOnImpassableTerrain)
return; return;
if (positionable.CanEnterCell(self.Location)) if (positionable.CanEnterCell(self.Location, self))
return; return;
var terrain = self.World.Map.GetTerrainInfo(self.Location); 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 sequence = terrain.IsWater ? info.WaterCorpseSequence : info.GroundCorpseSequence;
var palette = terrain.IsWater ? info.WaterCorpsePalette : info.GroundCorpsePalette; 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); self.Kill(self);
} }