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

Merge pull request #524 from Olink/general-devel

Browse source 
Add in error ignore for the socket exception in the packet bufferer.
This commit is contained in:
Lucas Nicodemus 2013-09-21 11:19:22 -07:00
commit 07c639d569
1 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

39
TShockAPI/PacketBufferer.cs
View file

@ -122,24 +122,24 @@ namespace TShockAPI
public bool Flush(ServerSock socket) public bool Flush(ServerSock socket)
{ {
try try
{ {
if (socket == null || !socket.active) if (socket == null || !socket.active)
return false; return false;
if (buffers[socket.whoAmI].Count < 1) if (buffers[socket.whoAmI].Count < 1)
return false; return false;
byte[] buff = buffers[socket.whoAmI].GetBytes(BytesPerUpdate); byte[] buff = buffers[socket.whoAmI].GetBytes(BytesPerUpdate);
if (buff == null) if (buff == null)
return false; return false;
if (SendBytes(socket, buff)) if (SendBytes(socket, buff))
{ {
buffers[socket.whoAmI].Pop(buff.Length); buffers[socket.whoAmI].Pop(buff.Length);
return true; return true;
} }
} }
catch (Exception e) catch (Exception e)
{ {
Log.ConsoleError(e.ToString()); Log.ConsoleError(e.ToString());
@ -201,7 +201,14 @@ namespace TShockAPI
} }
catch (SocketException e) catch (SocketException e)
{ {
Log.Warn(e.ToString()); switch ((uint)e.ErrorCode)
{
case 0x80004005:
break;
default:
Log.Warn(e.ToString());
break;
}
} }
catch (IOException e) catch (IOException e)
{ {