Merge remote-tracking branch 'upstream/master' into develop

2024-06-27 10:52:55 -03:00
parent f4219b0c75 8ef82ede43
commit 55e97a8baa
32 changed files with 411 additions and 132 deletions
@@ -56,6 +56,7 @@ namespace Barotrauma
            msg.WriteUInt16(ID);
            msg.WriteString(Name);
            msg.WriteString(OriginalName);
+            msg.WriteBoolean(RenamingEnabled);
            msg.WriteByte((byte)Head.Preset.TagSet.Count);
            foreach (Identifier tag in Head.Preset.TagSet)
            {
@@ -463,6 +463,7 @@ namespace Barotrauma
                    Client owner = controlEventData.Owner;
                    msg.WriteBoolean(owner == c && owner.Character == this);
                    msg.WriteByte(owner != null && owner.Character == this && GameMain.Server.ConnectedClients.Contains(owner) ? owner.SessionId : (byte)0);
+                    msg.WriteBoolean(info is { RenamingEnabled: true });
                    break;
                case CharacterStatusEventData statusEventData:
                    WriteStatus(msg, statusEventData.ForceAfflictionData);