diff --git a/Source/Game/Conditions/Condition.cs b/Source/Game/Conditions/Condition.cs index 3fd6c316f..8c0506764 100644 --- a/Source/Game/Conditions/Condition.cs +++ b/Source/Game/Conditions/Condition.cs @@ -666,7 +666,14 @@ namespace Game.Conditions mConditionTargets[0] = target0; mConditionTargets[1] = target1; mConditionTargets[2] = target2; - mConditionMap = target0 != null ? target0.GetMap() : null; + if (target0 != null) + mConditionMap = target0.GetMap(); + else if (target1 != null) + mConditionMap = target1.GetMap(); + else if (target2 != null) + mConditionMap = target2.GetMap(); + else + mConditionMap = null; mLastFailedCondition = null; }