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

Merge branch 'master' of https://github.com/vis2k/Mirror

Browse Source
This commit is contained in:
Chris Langsenkamp 2019-03-29 06:57:56 -04:00
commit 1db26fc747
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Mirror/Components/NetworkLobbyManager.cs
View File

@ -195,12 +195,6 @@ public override void OnServerDisconnect(NetworkConnection conn)
OnLobbyServerDisconnect(conn);
}
[System.Obsolete("Use OnServerAddPlayer(NetworkConnection conn, AddPlayerMessage extraMessage) instead")]
public override void OnServerAddPlayer(NetworkConnection conn)
{
OnServerAddPlayer(conn, null);
}
public override void OnServerAddPlayer(NetworkConnection conn, AddPlayerMessage extraMessage)
{
if (SceneManager.GetActiveScene().name != LobbyScene) return;

12
Assets/Mirror/Runtime/NetworkManager.cs
View File

@ -662,18 +662,6 @@ public virtual void OnServerReady(NetworkConnection conn)
NetworkServer.SetClientReady(conn);
}
[Obsolete("Use OnServerAddPlayer(NetworkConnection conn, AddPlayerMessage extraMessage) instead")]
public virtual void OnServerAddPlayer(NetworkConnection conn, NetworkMessage extraMessage)
{
OnServerAddPlayer(conn, null);
}
[Obsolete("Use OnServerAddPlayer(NetworkConnection conn, AddPlayerMessage extraMessage) instead")]
public virtual void OnServerAddPlayer(NetworkConnection conn)
{
OnServerAddPlayer(conn, null);
}
public virtual void OnServerAddPlayer(NetworkConnection conn, AddPlayerMessage extraMessage)
{
if (LogFilter.Debug) Debug.Log("NetworkManager.OnServerAddPlayer");