make an early check for null caster in OnRollSavingThrowOath

SolastaMods · Dec 2, 2023 · 51ff284 · 51ff284
1 parent b38a056
commit 51ff284
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/SolastaUnfinishedBusiness/Patches/RulesetImplementationManagerPatcher.cs b/SolastaUnfinishedBusiness/Patches/RulesetImplementationManagerPatcher.cs
@@ -751,14 +751,14 @@ internal static void OnRollSavingThrowOath(
             string selfConditionName,
             ConditionDefinition conditionDefinitionEnemy)
         {
-            if (sourceDefinition is not SpellDefinition { castingTime: ActivationTime.Action } &&
-                sourceDefinition is not FeatureDefinitionPower { RechargeRate: RechargeRate.ChannelDivinity } &&
-                !caster.AllConditions.Any(x => x.Name.Contains("Smite")))
+            if (caster == null || !caster.HasAnyConditionOfType(selfConditionName) || caster.Side == target.Side)
             {
                 return;
             }
 
-            if (caster == null || !caster.HasAnyConditionOfType(selfConditionName) || caster.Side == target.Side)
+            if (sourceDefinition is not SpellDefinition { castingTime: ActivationTime.Action } &&
+                sourceDefinition is not FeatureDefinitionPower { RechargeRate: RechargeRate.ChannelDivinity } &&
+                !caster.AllConditions.Any(x => x.Name.Contains("Smite")))
             {
                 return;
             }