Avoid messages from multiple threads rarely interleaving with each other

ClassiCube · May 27, 2020 · bcfbd16 · bcfbd16
1 parent d034a04
commit bcfbd16
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/MCGalaxy/Network/Player.Networking.cs b/MCGalaxy/Network/Player.Networking.cs
@@ -163,13 +163,16 @@ public partial class Player : IDisposable, INetProtocol {
             if (cancelmessage) { cancelmessage = false; return; }
 
             try {
-                foreach (string raw in LineWrapper.Wordwrap(message)) {
-                    string line = raw;
-                    if (!Supports(CpeExt.EmoteFix) && LineEndsInEmote(line))
-                        line += '\'';
-
-                    Send(Packet.Message(line, (CpeMessageType)id, hasCP437));
+                List<string> lines = LineWrapper.Wordwrap(message);
+                byte[] packet      = new byte[lines.Count * 66];
+
+                for (int i = 0; i < lines.Count; i++) {
+                    string line = lines[i];
+                    if (!Supports(CpeExt.EmoteFix) && LineEndsInEmote(line)) line += '\'';
+                    Packet.WriteMessage(line, id, hasCP437, packet, i * 66);
                 }
+                // So multi-line messages from multiple threads don't interleave
+                Send(packet);
             } catch (Exception e) {
                 Logger.LogError(e);
             }
@@ -245,9 +248,9 @@ public partial class Player : IDisposable, INetProtocol {
                 using (LevelChunkStream dst = new LevelChunkStream(this))
                     using (Stream stream = LevelChunkStream.CompressMapHeader(this, volume, dst))
                 {
-                	if (level.MightHaveCustomBlocks()) {
+                    if (level.MightHaveCustomBlocks()) {
                         LevelChunkStream.CompressMap(this, stream, dst);
-                	} else {
+                    } else {
                         LevelChunkStream.CompressMapSimple(this, stream, dst);
                     }
                 }