From 7af6d72bc3138c5c3667df933141740927a52085 Mon Sep 17 00:00:00 2001 From: MarioE Date: Sun, 16 Feb 2014 22:25:41 -0500 Subject: [PATCH] Rewrite SendRawData to trigger SendBytes hooks --- TShockAPI/TSPlayer.cs | 7 +++---- TerrariaServerAPI | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs index 87091889..40866999 100755 --- a/TShockAPI/TSPlayer.cs +++ b/TShockAPI/TSPlayer.cs @@ -887,12 +887,11 @@ namespace TShockAPI NetMessage.SendData((int) msgType, Index, -1, text, ply, number2, number3, number4, number5); } - public virtual bool SendRawData(byte[] data) + public virtual void SendRawData(byte[] data) { if (!RealPlayer || !ConnectionAlive) - return false; - - return TShock.SendBytes(Netplay.serverSock[Index], data); + return; + NetMessage.SendBytes(Netplay.serverSock[Index], data, 0, data.Length, Netplay.serverSock[Index].ServerWriteCallBack, Netplay.serverSock[Index].networkStream); } /// diff --git a/TerrariaServerAPI b/TerrariaServerAPI index 2a967a9d..6bac1465 160000 --- a/TerrariaServerAPI +++ b/TerrariaServerAPI @@ -1 +1 @@ -Subproject commit 2a967a9d6e736fbd1305a02994e79347b23cae9c +Subproject commit 6bac1465ee2dfe7544cb162436f78e3ef1d76bb8