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

2022-12-09 17:33:44 -03:00
parent 83c9c25164 6f788fb8b4
commit 90c3cef977
416 changed files with 12674 additions and 5862 deletions
@@ -210,9 +210,9 @@ namespace Barotrauma.Networking
            return length;
        }

-        public virtual void ServerWrite(IWriteMessage msg, Client c)
+        public virtual void ServerWrite(in SegmentTableWriter<ServerNetSegment> segmentTable, IWriteMessage msg, Client c)
        {
-            msg.WriteByte((byte)ServerNetObject.CHAT_MESSAGE);
+            segmentTable.StartNewSegment(ServerNetSegment.ChatMessage);
            msg.WriteUInt16(NetStateID);
            msg.WriteRangedInteger((int)Type, 0, Enum.GetValues(typeof(ChatMessageType)).Length - 1);
            msg.WriteByte((byte)ChangeType);