From 9ed2ffea918297921cfec0ef4be294566a508973 Mon Sep 17 00:00:00 2001 From: rob-v Date: Thu, 10 Jan 2019 14:36:41 +0100 Subject: [PATCH] Fix Warhead.IsValidAgainst (FrozenActor.Owner null) --- OpenRA.Mods.Common/Warheads/Warhead.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OpenRA.Mods.Common/Warheads/Warhead.cs b/OpenRA.Mods.Common/Warheads/Warhead.cs index eba5087cf1..b80a3461f3 100644 --- a/OpenRA.Mods.Common/Warheads/Warhead.cs +++ b/OpenRA.Mods.Common/Warheads/Warhead.cs @@ -82,6 +82,9 @@ namespace OpenRA.Mods.Common.Warheads /// Checks if the warhead is valid against (can do something to) the frozen actor. public bool IsValidAgainst(FrozenActor victim, Actor firedBy) { + if (!victim.IsValid) + return false; + // AffectsParent checks do not make sense for FrozenActors, so skip to stance checks var stance = firedBy.Owner.Stances[victim.Owner]; if (!ValidStances.HasStance(stance))