davejansen/lidgren-network-gen3
1
0
Fork 0
mirror of https://github.com/lidgren/lidgren-network-gen3.git synced 2026-05-06 02:11:06 +09:00
Code Issues Releases Activity

Delaying local Disconnect until next heartbeat

Browse Source
This commit is contained in:
lidgren
2014-11-20 10:14:59 +00:00
parent 740cc2ec1b
commit 9f6d3e79fd
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Lidgren.Network/NetConnection.Handshake.cs
View File

@@ -8,8 +8,9 @@ namespace Lidgren.Network
{ {
internal bool m_connectRequested; internal bool m_connectRequested;
internal bool m_disconnectRequested; internal bool m_disconnectRequested;
internal bool m_connectionInitiator; internal bool m_disconnectReqSendBye;
internal string m_disconnectMessage; internal string m_disconnectMessage;
internal bool m_connectionInitiator;
internal NetIncomingMessage m_remoteHailMessage; internal NetIncomingMessage m_remoteHailMessage;
internal float m_lastHandshakeSendTime; internal float m_lastHandshakeSendTime;
internal int m_handshakeAttempts; internal int m_handshakeAttempts;
@@ -486,6 +487,7 @@ namespace Lidgren.Network
m_handshakeAttempts = 0; m_handshakeAttempts = 0;
m_disconnectRequested = true; m_disconnectRequested = true;
m_disconnectReqSendBye = true;
} }
} }
} }

8
Lidgren.Network/NetConnection.cs
View File

@@ -165,7 +165,7 @@ namespace Lidgren.Network
if (m_disconnectRequested) if (m_disconnectRequested)
{ {
ExecuteDisconnect(m_disconnectMessage, true); ExecuteDisconnect(m_disconnectMessage, m_disconnectReqSendBye);
return; return;
} }
} }
@@ -414,7 +414,11 @@ namespace Lidgren.Network
case NetMessageType.Disconnect: case NetMessageType.Disconnect:
NetIncomingMessage msg = m_peer.SetupReadHelperMessage(ptr, payloadLength); NetIncomingMessage msg = m_peer.SetupReadHelperMessage(ptr, payloadLength);
ExecuteDisconnect(msg.ReadString(), false);
m_disconnectRequested = true;
m_disconnectMessage = msg.ReadString();
m_disconnectReqSendBye = false;
//ExecuteDisconnect(msg.ReadString(), false);
break; break;
case NetMessageType.Acknowledge: case NetMessageType.Acknowledge:
for (int i = 0; i < payloadLength; i+=3) for (int i = 0; i < payloadLength; i+=3)