AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-10-02 10:01:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Avoid messages from multiple threads rarely interleaving with each other

Browse Source
This commit is contained in:
UnknownShadow200 2020-05-27 18:26:43 +10:00
parent d034a047b7
commit bcfbd1624d
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
MCGalaxy/Network/Player.Networking.cs
View File

@ -163,13 +163,16 @@ namespace MCGalaxy {
if (cancelmessage) { cancelmessage = false; return; } if (cancelmessage) { cancelmessage = false; return; }
try { try {
foreach (string raw in LineWrapper.Wordwrap(message)) { List<string> lines = LineWrapper.Wordwrap(message);
string line = raw; byte[] packet = new byte[lines.Count * 66];
if (!Supports(CpeExt.EmoteFix) && LineEndsInEmote(line))
line += '\''; for (int i = 0; i < lines.Count; i++) {
string line = lines[i];
Send(Packet.Message(line, (CpeMessageType)id, hasCP437)); 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) { } catch (Exception e) {
Logger.LogError(e); Logger.LogError(e);
} }
@ -245,9 +248,9 @@ namespace MCGalaxy {
using (LevelChunkStream dst = new LevelChunkStream(this)) using (LevelChunkStream dst = new LevelChunkStream(this))
using (Stream stream = LevelChunkStream.CompressMapHeader(this, volume, dst)) using (Stream stream = LevelChunkStream.CompressMapHeader(this, volume, dst))
{ {
if (level.MightHaveCustomBlocks()) { if (level.MightHaveCustomBlocks()) {
LevelChunkStream.CompressMap(this, stream, dst); LevelChunkStream.CompressMap(this, stream, dst);
} else { } else {
LevelChunkStream.CompressMapSimple(this, stream, dst); LevelChunkStream.CompressMapSimple(this, stream, dst);
} }
} }