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

Merge pull request #12293 from abcdefg30/swallowNull

Browse Source 
Fix null being passed through the INotifyAttack interface
This commit is contained in:
Paul Chote
2017-01-29 16:32:35 +00:00
committed by GitHub
parent 9d7413ab3d 48cee8c426
commit 213b3dad2c
4 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Traits/Attack/AttackGarrisoned.cs
View File

@@ -156,7 +156,10 @@ namespace OpenRA.Mods.Common.Traits
paxPos[a.Actor].SetVisualPosition(a.Actor, pos + PortOffset(self, port));
var barrel = a.CheckFire(a.Actor, facing.Value, target);
if (barrel != null && a.Info.MuzzleSequence != null)
if (barrel == null)
return;
if (a.Info.MuzzleSequence != null)
{
// Muzzle facing is fixed once the firing starts
var muzzleAnim = new Animation(self.World, paxRender[a.Actor].GetImage(a.Actor), () => muzzleFacing);