Merge pull request #9870 from obrakmann/fix9831_viceroids-spawn-from-crushing

Fix viceroids being spawned by crushed infantry
This commit is contained in:
atlimit8
2015-11-02 21:48:35 -06:00

View File

@@ -73,7 +73,7 @@ namespace OpenRA.Mods.RA.Traits
return;
var warhead = e.Warhead as DamageWarhead;
if (info.DeathType != null && warhead != null && !warhead.DamageTypes.Contains(info.DeathType))
if (info.DeathType != null && (warhead == null || !warhead.DamageTypes.Contains(info.DeathType)))
return;
self.World.AddFrameEndTask(w =>