zydronium/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-08-01 23:31:55 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop'

Browse source 
# Conflicts:
#	FFXIVClassic Map Server/packets/send/Actor/events/SetEmoteEventCondition.cs
This commit is contained in:
Filip Maj 2016-03-30 20:18:28 -04:00
commit 8da3a6ff9c
37 changed files with 216 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

1
FFXIVClassic Lobby Server/ClientConnection.cs
View file

@ -76,6 +76,7 @@ namespace FFXIVClassic_Lobby_Server
public void disconnect()
{
socket.Shutdown(SocketShutdown.Both);
socket.Disconnect(false);
}
}

9
FFXIVClassic Lobby Server/Server.cs
View file

@ -51,9 +51,9 @@ namespace FFXIVClassic_Lobby_Server
#region Socket Handling
public bool startServer()
{
cleanupThread = new Thread(new ThreadStart(socketCleanup));
cleanupThread.Name = "LobbyThread:Cleanup";
cleanupThread.Start();
//cleanupThread = new Thread(new ThreadStart(socketCleanup));
//cleanupThread.Name = "LobbyThread:Cleanup";
//cleanupThread.Start();
IPEndPoint serverEndPoint = new System.Net.IPEndPoint(IPAddress.Parse(ConfigConstants.OPTIONS_BINDIP), FFXIV_LOBBY_PORT);
@ -147,7 +147,7 @@ namespace FFXIVClassic_Lobby_Server
bytesRead += conn.lastPartialSize;
if (bytesRead >= 0)
if (bytesRead > 0)
{
int offset = 0;
@ -187,6 +187,7 @@ namespace FFXIVClassic_Lobby_Server
lock (mConnectionList)
{
conn.disconnect();
mConnectionList.Remove(conn);
}
}