diff --git a/Server/Client.cs b/Server/Client.cs index bd2444f..4a79f58 100644 --- a/Server/Client.cs +++ b/Server/Client.cs @@ -38,6 +38,8 @@ public class Client : IDisposable { IMemoryOwner memory = MemoryPool.Shared.RentZero(Constants.HeaderSize + packet.Size); PacketAttribute packetAttribute = Constants.PacketMap[typeof(T)]; + if (packetAttribute.Type is not PacketType.Cap and not PacketType.Player) + Logger.Info($"Pre-header {packetAttribute.Type} ({(short)packetAttribute.Type}) - {typeof(T)}"); PacketHeader header = new PacketHeader { Id = sender?.Id ?? Id, Type = packetAttribute.Type, @@ -53,7 +55,7 @@ public class Client : IDisposable { memory.Dispose(); } - public async Task Send(Memory data, Client? sender, PacketType? partTime = null) { + public async Task Send(Memory data, Client? sender) { PacketHeader header = new PacketHeader(); header.Deserialize(data.Span); if (!Connected && header.Type is not PacketType.Connect) { @@ -61,10 +63,6 @@ public class Client : IDisposable { return; } - if (header.Type is not PacketType.Cap and not PacketType.Player) { - Logger.Info($"About to receive {header.Type} + ({(short)header.Type}), {partTime} ({(short?) partTime}) {new StackTrace().ToString()}"); - } - await Socket!.SendAsync(data[..(Constants.HeaderSize + header.PacketSize)], SocketFlags.None); } diff --git a/Server/Server.cs b/Server/Server.cs index 873c209..85e6a97 100644 --- a/Server/Server.cs +++ b/Server/Server.cs @@ -67,7 +67,7 @@ public class Server { // broadcast packets to all clients public delegate void PacketReplacer(Client from, Client to, T value); // replacer must send - public async Task BroadcastReplace(T packet, Client sender, PacketReplacer packetReplacer) where T : struct, IPacket { + public void BroadcastReplace(T packet, Client sender, PacketReplacer packetReplacer) where T : struct, IPacket { foreach (Client client in Clients.Where(client => sender.Id != client.Id)) packetReplacer(sender, client, packet); }