AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-22 12:05:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix custom chat tokens with : in them

Browse Source
This commit is contained in:
UnknownShadow200 2017-08-05 17:01:13 +10:00
parent db1fe40f90
commit a0725bfe48
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MCGalaxy/Chat/ChatTokens.cs
View File

@ -116,11 +116,12 @@ namespace MCGalaxy {
}
string[] lines = tokensFile.GetText();
string[] parts = new string[2];
char[] colon = new char[] {':'};
foreach (string line in lines) {
if (line.StartsWith("//")) continue;
line.FixedSplit(parts, ':');
if (parts[1] == null) continue; // not a proper line
string[] parts = line.Split(colon, 2);
if (parts.Length == 1) continue; // not a proper line
string key = parts[0].Trim(), value = parts[1].Trim();
if (key.Length == 0) continue;

2
MCGalaxy/Network/Socket/TcpSocket.cs
View File

@ -155,7 +155,7 @@ namespace MCGalaxy.Network {
// DoSendAsync returns false if SendAsync completed sync
// If that happens, SendCallback isn't called so we need to send data here instead
if (s.DoSendAsync(s.sendQueue.Dequeue())) return;
if (s.player.disconnected) s.sendQueue.Clear();
}
}