fix: server when sending to individual client messes packet order

This commit is contained in:
2025-11-13 20:24:23 +03:00
parent 24d9cdeafa
commit a050909375

View File

@@ -53,25 +53,10 @@ public class LiteNetLibServer : LiteNetLibCommunicatorBase, INetworkCommunicator
public INetworkCommunicatorServer SendToClient<T>(IConnection connection, T packet, PacketDelivery packetDelivery) where T : class, new() public INetworkCommunicatorServer SendToClient<T>(IConnection connection, T packet, PacketDelivery packetDelivery) where T : class, new()
{ {
netDataWriter.Reset();
if (Manager.ConnectedPeerList.FirstOrDefault(p => p.Id.ToString().CompareTo(connection.Id) == 0) is not NetPeer netPeer) if (Manager.ConnectedPeerList.FirstOrDefault(p => p.Id.ToString().CompareTo(connection.Id) == 0) is not NetPeer netPeer)
throw new($"Peer {connection} couldn't be found."); throw new($"Peer {connection} couldn't be found.");
if (packet is INetworkPacketEncrypted) // TODO performance improvements WritePacket(packet);
{
netDataWriterEncrypted.Reset();
netPacketProcessor.Write(netDataWriterEncrypted, packet);
byte[] encryptedData = cryptor.Encrypt(netDataWriterEncrypted.CopyData());
netDataWriter.Put(true);
netDataWriter.PutBytesWithLength(encryptedData);
}
else
{
netDataWriter.Put(false);
netPacketProcessor.Write(netDataWriter, packet);
}
switch (packetDelivery) switch (packetDelivery)
{ {
@@ -87,23 +72,7 @@ public class LiteNetLibServer : LiteNetLibCommunicatorBase, INetworkCommunicator
public INetworkCommunicatorServer SendToAll<T>(T packet, PacketDelivery packetDelivery) where T : class, new() public INetworkCommunicatorServer SendToAll<T>(T packet, PacketDelivery packetDelivery) where T : class, new()
{ {
netDataWriter.Reset(); WritePacket(packet);
netPacketProcessor.Write(netDataWriter, packet);
if (packet is INetworkPacketEncrypted)
{
netDataWriterEncrypted.Reset();
netPacketProcessor.Write(netDataWriterEncrypted, packet);
byte[] encryptedData = cryptor.Encrypt(netDataWriterEncrypted.CopyData());
netDataWriter.PutBytesWithLength(encryptedData);
netDataWriter.Put(true);
}
else
{
netPacketProcessor.Write(netDataWriter, packet);
netDataWriter.Put(false);
}
switch (packetDelivery) switch (packetDelivery)
{ {
@@ -116,6 +85,25 @@ public class LiteNetLibServer : LiteNetLibCommunicatorBase, INetworkCommunicator
return this; return this;
} }
private void WritePacket<T>(T packet) where T : class, new()
{
netDataWriter.Reset();
netDataWriterEncrypted.Reset();
if (packet is INetworkPacketEncrypted)
{
netPacketProcessor.Write(netDataWriterEncrypted, packet);
byte[] encryptedData = cryptor.Encrypt(netDataWriterEncrypted.CopyData());
netDataWriter.Put(true);
netDataWriter.PutBytesWithLength(encryptedData);
}
else
{
netDataWriter.Put(false);
netPacketProcessor.Write(netDataWriter, packet);
}
}
private void PollEvents(IUniverse sender, IUniverse.UpdateArguments args) => Manager.PollEvents(); private void PollEvents(IUniverse sender, IUniverse.UpdateArguments args) => Manager.PollEvents();
public override void EnterUniverse(IUniverse universe) public override void EnterUniverse(IUniverse universe)