diff --git a/OpenRa.Game/Traits/AttackBase.cs b/OpenRa.Game/Traits/AttackBase.cs index 041b9a8f74..cf17dd7b0b 100644 --- a/OpenRa.Game/Traits/AttackBase.cs +++ b/OpenRa.Game/Traits/AttackBase.cs @@ -93,7 +93,7 @@ namespace OpenRa.Game.Traits if (fireDelay > 0) return false; var limitedAmmo = self.traits.GetOrDefault(); - if (!limitedAmmo.HasAmmo()) + if (limitedAmmo != null && !limitedAmmo.HasAmmo()) return false; var weapon = Rules.WeaponInfo[weaponName];