3.3.8 - Hook NetMessage.SendPacket into existing SendBytes hook

Author: SignatureBeef

OTAPI.Patcher/OTAPI.Patcher.csproj

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

OTAPI.Scripts/Mods/HookClientSendBytes.Server.cs

@@ -59,6 +59,21 @@ void HookClientSendBytes(MonoModder modder)
             SendData.Remove();
         }
     }
+
+#if TerrariaServer_1448_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(
+            i => i.OpCode == OpCodes.Callvirt
+                && i.Operand is MethodReference methodReference
+                && methodReference.Name == "AsyncSend"
+        ))
+        {            
+            SendPacket.Emit(OpCodes.Ldarg_1); // remoteClient
+            SendPacket.EmitDelegate(OTAPI.Hooks.NetMessage.InvokeSendBytes);
+            SendPacket.Remove();
+        }
+#endif
 }
 
 namespace OTAPI