Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

This commit is contained in:
Evil Factory
2025-09-17 08:30:35 -03:00
121 changed files with 2582 additions and 635 deletions
@@ -3764,7 +3764,7 @@ namespace Barotrauma.Networking
UpdateVoteStatus();
SendChatMessage(peerDisconnectPacket.ChatMessage(client).Value, ChatMessageType.Server, changeType: peerDisconnectPacket.ConnectionChangeType);
SendChatMessage(peerDisconnectPacket.ChatMessage(client.Name).Value, ChatMessageType.Server, changeType: peerDisconnectPacket.ConnectionChangeType);
UpdateCrewFrame();
@@ -4291,13 +4291,14 @@ namespace Barotrauma.Networking
serverPeer.Send(msg, client.Connection, DeliveryMethod.Reliable);
}
public void UnlockRecipe(Identifier identifier)
public void UnlockRecipe(CharacterTeamType team, Identifier identifier)
{
IWriteMessage msg = new WriteOnlyMessage();
msg.WriteByte((byte)ServerPacketHeader.UNLOCKRECIPE);
msg.WriteByte((byte)team);
msg.WriteIdentifier(identifier);
foreach (var client in connectedClients)
{
IWriteMessage msg = new WriteOnlyMessage();
msg.WriteByte((byte)ServerPacketHeader.UNLOCKRECIPE);
msg.WriteIdentifier(identifier);
serverPeer.Send(msg, client.Connection, DeliveryMethod.Reliable);
}
}