Update PatchNpcStrikeArgs.Server.cs

Author: SignatureBeef

OTAPI.Scripts/Patches/PatchNpcStrikeArgs.Server.cs

@@ -73,12 +73,22 @@ static void PatchNpcStrikeArgs(ModFwModder modder)
                         switch (methodName.Replace(HookEmitter.HookMethodNamePrefix, ""))
                         {
                             case "MessageBuffer.GetData":
+                                var playerRef = Instruction.Create(OpCodes.Ldsfld, modder.Module.ImportReference(modder.GetFieldDefinition(() => Terraria.Main.player)));
+                                body.GetILProcessor().InsertBefore(instr, playerRef);
                                 body.GetILProcessor().InsertBefore(instr,
-                                    new { OpCodes.Ldsfld, Operand = modder.Module.ImportReference(modder.GetFieldDefinition(() => Terraria.Main.player)) },
-                                    new { OpCodes.Ldarg_0 },
-                                    new { OpCodes.Ldfld, Operand = modder.Module.ImportReference(modder.GetFieldDefinition(() => (new Terraria.MessageBuffer()).whoAmI)) },
-                                    new { OpCodes.Ldelem_Ref }
-                                );
+                                    new { OpCodes.Ldarg_0 }, 
+                                    new { OpCodes.Ldfld, Operand = modder.Module.ImportReference(modder.GetFieldDefinition(() => (new Terraria.MessageBuffer()).whoAmI)) }, 
+                                    new { OpCodes.Ldelem_Ref } 
+                                ); 
+
+                                var hasWhoAmI = instr.Previous.OpCode == OpCodes.Ldfld &&
+                                    instr.Previous.Operand is FieldReference fieldReference && 
+                                    fieldReference.Name == "whoAmI";                                     
+                                if (hasWhoAmI) { // 145+  
+                                    // rewire the branching
+                                    var brs = instr.Previous(x => x.OpCode == OpCodes.Br_S);
+                                    brs.Operand = playerRef;
+                                } 
                                 break;
 
                             case "NPC.StrikeNPCNoInteraction":