diff --git a/Assets/Mirage/Runtime/INetworkClient.cs b/Assets/Mirage/Runtime/INetworkClient.cs index 733bd87c97d..573ff737726 100644 --- a/Assets/Mirage/Runtime/INetworkClient.cs +++ b/Assets/Mirage/Runtime/INetworkClient.cs @@ -1,9 +1,8 @@ -using Cysharp.Threading.Tasks; using UnityEngine.Events; namespace Mirage { - public interface INetworkClient + public interface INetworkClient : IMessageSender { /// @@ -38,9 +37,5 @@ public interface INetworkClient bool IsLocalClient { get; } void Disconnect(); - - void Send(T message, int channelId = Channel.Reliable); - - UniTask SendAsync(T message, int channelId = Channel.Reliable); } } diff --git a/Assets/Mirage/Runtime/NetworkClient.cs b/Assets/Mirage/Runtime/NetworkClient.cs index 84dcd609955..a7a598e92d1 100644 --- a/Assets/Mirage/Runtime/NetworkClient.cs +++ b/Assets/Mirage/Runtime/NetworkClient.cs @@ -260,7 +260,12 @@ public UniTask SendAsync(T message, int channelId = Channel.Reliable) public void Send(T message, int channelId = Channel.Reliable) { - Connection.SendAsync(message, channelId).Forget(); + Connection.Send(message, channelId); + } + + public UniTask SendAsync(ArraySegment segment, int channelId = Channel.Reliable) + { + return Connection.SendAsync(segment, channelId); } internal void Update() diff --git a/Assets/Mirage/Weaver/Processors/ReaderWriterProcessor.cs b/Assets/Mirage/Weaver/Processors/ReaderWriterProcessor.cs index 163ce9381f8..850bf5b23a5 100644 --- a/Assets/Mirage/Weaver/Processors/ReaderWriterProcessor.cs +++ b/Assets/Mirage/Weaver/Processors/ReaderWriterProcessor.cs @@ -228,8 +228,6 @@ private static bool IsMessageMethod(MethodReference method) method.Is(nameof(NetworkConnection.SendAsync)) || method.Is(nameof(NetworkConnection.RegisterHandler)) || method.Is(nameof(NetworkConnection.UnregisterHandler)) || - method.Is(nameof(INetworkClient.Send)) || - method.Is(nameof(INetworkClient.SendAsync)) || method.Is(nameof(NetworkClient.Send)) || method.Is(nameof(NetworkClient.SendAsync)) || method.Is(nameof(NetworkServer.SendToAll)) ||