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 crashing yet again

Browse Source
This commit is contained in:
UnknownShadow200 2017-08-18 21:59:30 +10:00
parent 82ffc8dce5
commit 0935da50de
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,8 +147,11 @@ namespace MCGalaxy.Network {
}
static void SendCallback(object sender, SocketAsyncEventArgs e) {
TcpSocket s = (TcpSocket)e.UserToken;
Player p = null;
try {
TcpSocket s = (TcpSocket)e.UserToken;
p = s.player;
// TODO: Need to check if all data was sent or not?
int sent = e.BytesTransferred;
lock (s.sendLock) {
@ -159,13 +162,15 @@ namespace MCGalaxy.Network {
// 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();
if (p.disconnected) s.sendQueue.Clear();
}
}
} catch (SocketException) {
s.player.Disconnect();
if (p != null) p.Disconnect();
} catch (ObjectDisposedException) {
// Socket was already closed by another thread
} catch (Exception ex) {
Logger.LogError(ex);
}
}