Skip to content

Fix projectile strike source in Damage_PVE_Inner #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CedaryCat wants to merge 4 commits into
base: upcoming
Choose a base branch
from
+3 −9
Open

Fix projectile strike source in Damage_PVE_Inner #161

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a805bb7
Fix projectile strike source in Damage_PVE_Inner
CedaryCat Feb 16, 2026
1a8d5eb
Make Damage_PVE_Inner patch branch explicit for 145+
CedaryCat Feb 24, 2026
0bc8ec2
Merge branch 'SignatureBeef:upcoming' into upcoming
CedaryCat Feb 24, 2026
a6710a2
Merge branch 'upcoming' of https://github.com/CedaryCat/Open-Terraria…
CedaryCat Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions OTAPI.Scripts/Patches/PatchNpcStrikeArgs.Server.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down