Merge fixes

This commit is contained in:
EvilFactory
2024-03-28 16:19:53 -03:00
parent a95ef7ac08
commit bf34934e9c
10 changed files with 90 additions and 46 deletions
@@ -29,6 +29,8 @@ namespace Barotrauma
File.Move("Barotrauma.dll", "Temp/Original/Barotrauma.dll", true);
File.Move("Barotrauma.deps.json", "Temp/Original/Barotrauma.deps.json", true);
File.Move("Barotrauma.pdb", "Temp/Original/Barotrauma.pdb", true);
File.Move("BarotraumaCore.dll", "Temp/Original/BarotraumaCore.dll", true);
File.Move("BarotraumaCore.pdb", "Temp/Original/BarotraumaCore.pdb", true);
File.Move("System.Reflection.Metadata.dll", "Temp/Original/System.Reflection.Metadata.dll", true);
File.Move("System.Collections.Immutable.dll", "Temp/Original/System.Collections.Immutable.dll", true);
@@ -144,7 +144,7 @@ namespace Barotrauma
message.WriteUInt16(id);
message.WriteString(name);
Send(message, null, DeliveryMethod.ReliableOrdered);
Send(message, null, DeliveryMethod.Reliable);
}
private void WriteAllIds(Client client)
@@ -160,7 +160,7 @@ namespace Barotrauma
message.WriteString(name);
}
Send(message, client.Connection, DeliveryMethod.ReliableOrdered);
Send(message, client.Connection, DeliveryMethod.Reliable);
}
public void ClientWriteLobby(Client client) => GameMain.Server.ClientWriteLobby(client);
@@ -185,11 +185,6 @@ namespace Barotrauma
GameMain.Server.UpdateClientPermissions(client);
}
public void RemovePendingClient(ServerPeer.PendingClient pendingClient, PeerDisconnectPacket peerDisconnectPacket)
{
GameMain.Server.ServerPeer.RemovePendingClient(pendingClient, peerDisconnectPacket);
}
public int FileSenderMaxPacketsPerUpdate
{
get { return FileSender.FileTransferOut.MaxPacketsPerUpdate; }