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

NetworkServer.SetClientReady: use if+else instead of if + early return

Browse Source
This commit is contained in:
vis2k 2019-03-22 12:00:16 +01:00
parent 0e8b442cad
commit c176da7bc3
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Assets/Mirror/Runtime/NetworkServer.cs
View File

@ -789,36 +789,37 @@ public static void SetClientReady(NetworkConnection conn)
} }
} }
} }
return;
} }
else
// Spawn/update all current server objects
if (LogFilter.Debug) Debug.Log("Spawning " + NetworkIdentity.spawned.Count + " objects for conn " + conn.connectionId);
conn.Send(new ObjectSpawnStartedMessage());
foreach (NetworkIdentity identity in NetworkIdentity.spawned.Values)
{ {
if (identity == null) // Spawn/update all current server objects
if (LogFilter.Debug) Debug.Log("Spawning " + NetworkIdentity.spawned.Count + " objects for conn " + conn.connectionId);
conn.Send(new ObjectSpawnStartedMessage());
foreach (NetworkIdentity identity in NetworkIdentity.spawned.Values)
{ {
Debug.LogWarning("Invalid object found in server local object list (null NetworkIdentity)."); if (identity == null)
continue; {
} Debug.LogWarning("Invalid object found in server local object list (null NetworkIdentity).");
if (!identity.gameObject.activeSelf) continue;
{ }
continue; if (!identity.gameObject.activeSelf)
{
continue;
}
if (LogFilter.Debug) Debug.Log("Sending spawn message for current server objects name='" + identity.name + "' netId=" + identity.netId);
bool visible = identity.OnCheckObserver(conn);
if (visible)
{
identity.AddObserver(conn);
}
} }
if (LogFilter.Debug) Debug.Log("Sending spawn message for current server objects name='" + identity.name + "' netId=" + identity.netId); conn.Send(new ObjectSpawnFinishedMessage());
bool visible = identity.OnCheckObserver(conn);
if (visible)
{
identity.AddObserver(conn);
}
} }
conn.Send(new ObjectSpawnFinishedMessage());
} }
internal static void ShowForConnection(NetworkIdentity identity, NetworkConnection conn) internal static void ShowForConnection(NetworkIdentity identity, NetworkConnection conn)