Skip to content

Commit 0d401ce

Browse files
committed
Revert "Make Damage_PVE_Inner patch branch explicit for 145+"
This reverts commit 1a8d5eb.
1 parent a6710a2 commit 0d401ce

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

OTAPI.Scripts/Patches/PatchNpcStrikeArgs.Server.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,10 @@ instr.Previous.Operand is FieldReference fieldReference &&
101101

102102
case "Player.ApplyDamageToNPC":
103103
case "Player.ItemCheck_MeleeHitNPCs":
104+
case "Projectile.Damage":
104105
case "Player.ProcessHitAgainstNPC":
105106
case "NPC.StrikeNPC":
106-
#if TerrariaServer_1450_OrAbove || Terraria__1450_OrAbove || tModLoader_1450_OrAbove
107-
case "Projectile.Damage_PVE_Inner": // introduced/split in 145+
108-
#endif
107+
case "Projectile.Damage_PVE_Inner":
109108
body.GetILProcessor().InsertBefore(instr,
110109
new { OpCodes.Ldarg_0 }
111110
);

0 commit comments

Comments
 (0)