From 880cf014f11d1412ac8c04897416294c5ffde479 Mon Sep 17 00:00:00 2001
From: Manifold Paradox <masakitenchi@users.noreply.github.com>
Date: Sat, 28 Dec 2024 10:12:10 +0900
Subject: [PATCH] Fix NRE when riposte kills opponents

---
 Source/CombatExtended/Harmony/Harmony_Verb.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/CombatExtended/Harmony/Harmony_Verb.cs b/Source/CombatExtended/Harmony/Harmony_Verb.cs
index 563826150a..62e22d20d9 100644
--- a/Source/CombatExtended/Harmony/Harmony_Verb.cs
+++ b/Source/CombatExtended/Harmony/Harmony_Verb.cs
@@ -35,8 +35,8 @@ internal static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruct
 
             FieldInfo fverbProps = AccessTools.Field(typeof(Verb), nameof(Verb.verbProps));
             FieldInfo fticksBetweenBurstShots = AccessTools.Field(typeof(VerbProperties), nameof(VerbProperties.ticksBetweenBurstShots));
-            FieldInfo fnonInterruptingSelfCast = AccessTools.Field(typeof(VerbProperties), nameof(VerbProperties.nonInterruptingSelfCast));
 
+            MethodInfo pnonInterruptingSelfCast = AccessTools.PropertyGetter(typeof(Verb), nameof(Verb.NonInterruptingSelfCast));
             MethodInfo pCasterPawn = AccessTools.PropertyGetter(typeof(Verb), nameof(Verb.CasterPawn));
             MethodInfo pSpawned = AccessTools.PropertyGetter(typeof(Pawn), nameof(Pawn.Spawned));
 
@@ -58,7 +58,7 @@ internal static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruct
                 // Check if the caster pawn is spawned before attempting to set them into cooldown stance,
                 // since the caster may be dead as a result e.g. a successful melee riposte in TryCastShot().
                 // Vanilla already performs this check if the attack connected, but not when it missed.
-                if (codes[i].Branches(out Label? blockEndLabel) && codes[i - 1].LoadsField(fnonInterruptingSelfCast))
+                if (codes[i].Branches(out Label? blockEndLabel) && codes[i - 1].Is(OpCodes.Call, pnonInterruptingSelfCast))
                 {
                     yield return codes[i];
                     yield return new CodeInstruction(OpCodes.Ldarg_0);