charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 19:10:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NetworkClient.Disconnect: cleanup code moved into OnTransportDisconnected

Browse Source
This commit is contained in:
vis2k 2021-05-11 11:36:05 +08:00
parent 4de0d4a28a
commit a056072aec
1 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Assets/Mirror/Runtime/NetworkClient.cs
View File

@ -205,36 +205,11 @@ public static void ConnectLocalServer()
// disconnect //////////////////////////////////////////////////////////
/// <summary>Disconnect from server.</summary>
// Simply call NetworkConnection.Disconnect -> Transport.Disconnect.
// Cleanup happens in OnTransportDisconnected!
public static void Disconnect()
{
connectState = ConnectState.Disconnected;
ready = false;
// local or remote connection?
if (isLocalClient)
{
if (isConnected)
{
// call client OnDisconnected with connection to server
// => previously we used to send a DisconnectMessage to
// NetworkServer.localConnection. this would queue the
// message until NetworkClient.Update processes it.
// => invoking the client's OnDisconnected event directly
// here makes tests fail. so let's do it exactly the same
// order as before by queueing the event for next Update!
//OnDisconnectedEvent?.Invoke(connection);
((LocalConnectionToServer)connection).QueueDisconnectedEvent();
}
NetworkServer.RemoveLocalConnection();
}
else
{
if (connection != null)
{
connection.Disconnect();
connection = null;
}
}
connection?.Disconnect();
}
/// <summary>Disconnect host mode.</summary>
@ -291,6 +266,36 @@ static void OnTransportDisconnected()
connectState = ConnectState.Disconnected;
ready = false;
// this was in Disconnect() before.
// but it should happen after truly disconnecting here.
// local or remote connection?
if (isLocalClient)
{
// TODO move into LocalConnection.Disconnect
if (isConnected)
{
// call client OnDisconnected with connection to server
// => previously we used to send a DisconnectMessage to
// NetworkServer.localConnection. this would queue the
// message until NetworkClient.Update processes it.
// => invoking the client's OnDisconnected event directly
// here makes tests fail. so let's do it exactly the same
// order as before by queueing the event for next Update!
//OnDisconnectedEvent?.Invoke(connection);
((LocalConnectionToServer)connection).QueueDisconnectedEvent();
}
NetworkServer.RemoveLocalConnection();
}
else
{
if (connection != null)
{
connection.Disconnect();
connection = null;
}
}
if (connection != null) OnDisconnectedEvent?.Invoke();
}