Skip to content

Commit 20d280f

Browse files
Merge pull request #161 from CedaryCat/upcoming
Fix projectile strike source in Damage_PVE_Inner
2 parents 4d44253 + 0d401ce commit 20d280f

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

OTAPI.Scripts/Patches/PatchNpcStrikeArgs.Server.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,9 @@ instr.Previous.Operand is FieldReference fieldReference &&
104104
case "Projectile.Damage":
105105
case "Player.ProcessHitAgainstNPC":
106106
case "NPC.StrikeNPC":
107-
body.GetILProcessor().InsertBefore(instr,
108-
new { OpCodes.Ldarg_0 }
109-
);
110-
break;
111-
112107
case "Projectile.Damage_PVE_Inner":
113-
// find the NPC parameter
114-
var prm = body.Method.Parameters.Single(x => x.ParameterType.FullName == "Terraria.NPC");
115108
body.GetILProcessor().InsertBefore(instr,
116-
new { OpCodes.Ldarg, Operand = prm }
109+
new { OpCodes.Ldarg_0 }
117110
);
118111
break;
119112

0 commit comments

Comments
 (0)