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

Make the logic simpler for ensuring the connection is ready

Browse Source
This commit is contained in:
Paul Pacheco 2018-06-28 08:50:13 -05:00
parent 5acaf30f3a
commit 8d4f6915d1
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Unity-Technologies-networking/Runtime/ClientScene.cs
View File

@ -165,19 +165,17 @@ public static bool AddPlayer(NetworkConnection readyConn, short playerController
} }
// ensure valid ready connection // ensure valid ready connection
if (readyConn == null) if (readyConn != null)
{ {
s_IsReady = true;
s_ReadyConnection = readyConn;
}
if (!s_IsReady) if (!s_IsReady)
{ {
if (LogFilter.logError) { Debug.LogError("Must call AddPlayer() with a connection the first time to become ready."); } if (LogFilter.logError) { Debug.LogError("Must call AddPlayer() with a connection the first time to become ready."); }
return false; return false;
} }
}
else
{
s_IsReady = true;
s_ReadyConnection = readyConn;
}
PlayerController existingPlayerController; PlayerController existingPlayerController;
if (s_ReadyConnection.GetPlayerController(playerControllerId, out existingPlayerController)) if (s_ReadyConnection.GetPlayerController(playerControllerId, out existingPlayerController))