Merge branch 'upcoming' into upcoming-nuget-release

Author: SignatureBeef

OTAPI.Patcher/OTAPI.Patcher.csproj

@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>3.3.8</Version>
+		<Version>3.3.9</Version>
 		<PreserveCompilationContext>true</PreserveCompilationContext>
 		<RuntimeIdentifiers>win;osx;linux;</RuntimeIdentifiers>
 		<Nullable>enable</Nullable>

OTAPI.Scripts/Mods/HookClientSendBytes.Server.cs

@@ -60,7 +60,7 @@ void HookClientSendBytes(MonoModder modder)
         }
     }
 
-#if TerrariaServer_1448_OrAbove
+#if TerrariaServer_1450_OrAbove
         var SendPacket = modder.GetILCursor(() => Terraria.NetMessage.SendPacket(default, default));
         // find each AsyncSend, replace with OTAPI.Hooks.NetMessage.InvokeSendBytes, and inject arg2 (remoteClient) as well.
         while (SendPacket.TryGotoNext(

OTAPI.Scripts/Patches/PatchNpcStrikeArgs.Server.cs

@@ -104,16 +104,9 @@ instr.Previous.Operand is FieldReference fieldReference &&
                             case "Projectile.Damage":
                             case "Player.ProcessHitAgainstNPC":
                             case "NPC.StrikeNPC":
-                                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 }
+                                    new { OpCodes.Ldarg_0 }
                                 );
                                 break;