From 17370c9e2ed2d7b125ee32c13e4beac9a7c1a3c0 Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Mon, 2 Nov 2015 21:28:31 +0100 Subject: [PATCH] Fix viceroids being spawned by crushed infantry --- OpenRA.Mods.RA/Traits/SpawnActorOnDeath.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenRA.Mods.RA/Traits/SpawnActorOnDeath.cs b/OpenRA.Mods.RA/Traits/SpawnActorOnDeath.cs index 24a1b7e8b2..01661e6bd8 100644 --- a/OpenRA.Mods.RA/Traits/SpawnActorOnDeath.cs +++ b/OpenRA.Mods.RA/Traits/SpawnActorOnDeath.cs @@ -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 =>