fix IsMelee validator to use attackMode source object

SolastaMods · Jul 9, 2024 · 2b299ff · 2b299ff
1 parent d111627
commit 2b299ff
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/SolastaUnfinishedBusiness/Validators/ValidatorsWeapon.cs b/SolastaUnfinishedBusiness/Validators/ValidatorsWeapon.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 using JetBrains.Annotations;
+using SolastaUnfinishedBusiness.Api.GameExtensions;
 using SolastaUnfinishedBusiness.Behaviors.Specific;
 using static RuleDefinitions;
 using static SolastaUnfinishedBusiness.Api.DatabaseHelper.ArmorTypeDefinitions;
@@ -90,7 +91,7 @@ internal static bool IsMelee(
         [UsedImplicitly] RulesetCharacter rulesetCharacter)
     {
         // don't use IsMelee(attackMode) in here as these are used before an attack initiates
-        return IsMelee(rulesetItem);
+        return IsMelee(attackMode?.SourceObject as RulesetItem ?? rulesetItem ?? rulesetCharacter?.GetMainWeapon());
     }
 #pragma warning restore IDE0060