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

Merge pull request #8327 from Mailaender/swallow-ammopool-nre

Browse Source 
Fixed an explicit NRE from SwallowActor.WormAttack
This commit is contained in:
Oliver Brakmann
2015-06-01 17:14:37 +02:00
parent 32f420976e 1fd25a3d3a
commit c1835e9214
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Traits/AmmoPool.cs
View File

@@ -99,7 +99,7 @@ namespace OpenRA.Mods.Common.Traits
public void Attacking(Actor self, Target target, Armament a, Barrel barrel)
{
if (a.Info.AmmoPoolName == Info.Name)
if (a != null && a.Info.AmmoPoolName == Info.Name)
TakeAmmo();
}