themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fixed issue of the client being killed before receiving the disconnect message.

Browse source
This commit is contained in:
high 2011-08-17 21:45:41 -04:00
parent 4dae27001c
commit 7b58100546
3 changed files with 55 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

57
TShockAPI/PacketBufferer.cs
View file

@ -91,32 +91,49 @@ namespace TShockAPI
}
void GameHooks_Update(GameTime obj)
{
FlushAll();
}
public void FlushAll()
{
for (int i = 0; i < Netplay.serverSock.Length; i++)
{
if (Netplay.serverSock[i] == null || !Netplay.serverSock[i].active)
continue;
if (!Netplay.serverSock[i].tcpClient.Client.Poll(0, SelectMode.SelectWrite))
continue;
byte[] buff = buffers[i].GetBytes(BytesPerUpdate);
if (buff == null)
continue;
try
{
Netplay.serverSock[i].tcpClient.Client.Send(buff);
}
catch (ObjectDisposedException)
{
}
catch (SocketException)
{
}
Flush(Netplay.serverSock[i]);
}
}
public bool Flush(ServerSock socket)
{
try
{
if (socket == null || !socket.active)
return false;
if (!socket.tcpClient.Client.Poll(0, SelectMode.SelectWrite))
return false;
byte[] buff = buffers[socket.whoAmI].GetBytes(BytesPerUpdate);
if (buff == null)
return false;
socket.tcpClient.Client.Send(buff);
return true;
}
catch (ObjectDisposedException)
{
}
catch (SocketException)
{
}
catch (Exception e)
{
Log.ConsoleError(e.ToString());
}
return false;
}
void ServerHooks_SocketReset(ServerSock socket)
{