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

Merge pull request #11199 from reaperrr/fix-para-nre

Browse Source 
Fix potential NRE in Parachutable
This commit is contained in:
Oliver Brakmann
2016-04-30 13:53:04 +02:00
parent a9ec325765 b87b2c010f
commit cc9f84f136
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Traits/Parachutable.cs
View File

@@ -16,7 +16,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("Can be paradropped by a ParaDrop actor.")]
class ParachutableInfo : ITraitInfo
class ParachutableInfo : ITraitInfo, Requires<IPositionableInfo>
{
[Desc("If we land on invalid terrain for my actor type should we be killed?")]
public readonly bool KilledOnImpassableTerrain = true;
@@ -51,8 +51,7 @@ namespace OpenRA.Mods.Common.Traits
{
self = init.Self;
this.info = info;
positionable = self.TraitOrDefault<IPositionable>();
positionable = self.Trait<IPositionable>();
}
void INotifyParachuteLanded.OnLanded(Actor ignore)