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

Fix p.Message calls that expand to over 62 lines throwing an exception

Browse Source
This commit is contained in:
UnknownShadow200 2020-06-13 16:22:45 +10:00
parent 0a380c1731
commit d1ac0e9f07
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,6 +153,24 @@ namespace MCGalaxy {
public void SendMessage(byte id, string message) { Message(id, message); } public void SendMessage(byte id, string message) { Message(id, message); }
public void Message(string message) { Message(0, message); } public void Message(string message) { Message(0, message); }
// Need to combine chat line packets into one Send call, so that
// multi-line messages from multiple threads don't interleave
void SendLines(List<string> lines) {
for (int i = 0; i < lines.Count;) {
// Send buffer max size is 4096 bytes
// Divide by 66 (size of chat packet) gives ~62 lines
int count = Math.Min(62, lines.Count - i);
byte[] data = new byte[count * 66];
for (int j = 0; j < count; i++, j++) {
string line = lines[i];
if (!Supports(CpeExt.EmoteFix) && LineEndsInEmote(line)) line += '\'';
Packet.WriteMessage(line, id, hasCP437, data, j * 66);
}
Send(data);
}
}
public virtual void Message(byte id, string message) { public virtual void Message(byte id, string message) {
// Message should start with server color if no initial color // Message should start with server color if no initial color
if (message.Length > 0 && !(message[0] == '&' || message[0] == '%')) { if (message.Length > 0 && !(message[0] == '&' || message[0] == '%')) {
@ -163,16 +181,7 @@ namespace MCGalaxy {
if (cancelmessage) { cancelmessage = false; return; } if (cancelmessage) { cancelmessage = false; return; }
try { try {
List<string> lines = LineWrapper.Wordwrap(message); SendLines(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) { } catch (Exception e) {
Logger.LogError(e); Logger.LogError(e);
} }