diff --git a/OTAPI.Scripts/Patches/PatchNpcStrikeArgs.Server.cs b/OTAPI.Scripts/Patches/PatchNpcStrikeArgs.Server.cs index 5b107616..42378904 100644 --- a/OTAPI.Scripts/Patches/PatchNpcStrikeArgs.Server.cs +++ b/OTAPI.Scripts/Patches/PatchNpcStrikeArgs.Server.cs @@ -101,22 +101,16 @@ instr.Previous.Operand is FieldReference fieldReference && case "Player.ApplyDamageToNPC": case "Player.ItemCheck_MeleeHitNPCs": - case "Projectile.Damage": case "Player.ProcessHitAgainstNPC": case "NPC.StrikeNPC": +#if TerrariaServer_1450_OrAbove || Terraria__1450_OrAbove || tModLoader_1450_OrAbove + case "Projectile.Damage_PVE_Inner": // introduced/split in 145+ +#endif body.GetILProcessor().InsertBefore(instr, new { OpCodes.Ldarg_0 } ); break; - case "Projectile.Damage_PVE_Inner": - // find the NPC parameter - var prm = body.Method.Parameters.Single(x => x.ParameterType.FullName == "Terraria.NPC"); - body.GetILProcessor().InsertBefore(instr, - new { OpCodes.Ldarg, Operand = prm } - ); - break; - default: throw new NotImplementedException($"{body.Method.FullName} is not a supported caller for this modification"); }