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

NetworkClient - Use TryGetComponent (#3331)

Browse Source 
This eliminates allocations, at least in the editor, per Unity docs.
This commit is contained in:
MrGadget 2022-12-31 07:59:57 -05:00 committed by GitHub
parent 82a7e752a8
commit 993caf3b36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Assets/Mirror/Core/NetworkClient.cs
View File

@ -571,8 +571,7 @@ public static void RegisterPrefab(GameObject prefab, uint newAssetId)
return; return;
} }
NetworkIdentity identity = prefab.GetComponent<NetworkIdentity>(); if (!prefab.TryGetComponent<NetworkIdentity>(out NetworkIdentity identity))
if (identity == null)
{ {
Debug.LogError($"Could not register '{prefab.name}' since it contains no NetworkIdentity component"); Debug.LogError($"Could not register '{prefab.name}' since it contains no NetworkIdentity component");
return; return;
@ -598,8 +597,7 @@ public static void RegisterPrefab(GameObject prefab)
return; return;
} }
NetworkIdentity identity = prefab.GetComponent<NetworkIdentity>(); if (!prefab.TryGetComponent<NetworkIdentity>(out NetworkIdentity identity))
if (identity == null)
{ {
Debug.LogError($"Could not register '{prefab.name}' since it contains no NetworkIdentity component"); Debug.LogError($"Could not register '{prefab.name}' since it contains no NetworkIdentity component");
return; return;
@ -635,8 +633,7 @@ public static void RegisterPrefab(GameObject prefab, SpawnDelegate spawnHandler,
return; return;
} }
NetworkIdentity identity = prefab.GetComponent<NetworkIdentity>(); if (!prefab.TryGetComponent<NetworkIdentity>(out NetworkIdentity identity))
if (identity == null)
{ {
Debug.LogError($"Could not register handler for '{prefab.name}' since it contains no NetworkIdentity component"); Debug.LogError($"Could not register handler for '{prefab.name}' since it contains no NetworkIdentity component");
return; return;
@ -683,8 +680,7 @@ public static void RegisterPrefab(GameObject prefab, uint newAssetId, SpawnHandl
return; return;
} }
NetworkIdentity identity = prefab.GetComponent<NetworkIdentity>(); if (!prefab.TryGetComponent<NetworkIdentity>(out NetworkIdentity identity))
if (identity == null)
{ {
Debug.LogError($"Could not register handler for '{prefab.name}' since it contains no NetworkIdentity component"); Debug.LogError($"Could not register handler for '{prefab.name}' since it contains no NetworkIdentity component");
return; return;
@ -750,8 +746,7 @@ public static void RegisterPrefab(GameObject prefab, SpawnHandlerDelegate spawnH
return; return;
} }
NetworkIdentity identity = prefab.GetComponent<NetworkIdentity>(); if (!prefab.TryGetComponent<NetworkIdentity>(out NetworkIdentity identity))
if (identity == null)
{ {
Debug.LogError($"Could not register handler for '{prefab.name}' since it contains no NetworkIdentity component"); Debug.LogError($"Could not register handler for '{prefab.name}' since it contains no NetworkIdentity component");
return; return;
@ -815,8 +810,7 @@ public static void UnregisterPrefab(GameObject prefab)
return; return;
} }
NetworkIdentity identity = prefab.GetComponent<NetworkIdentity>(); if (!prefab.TryGetComponent<NetworkIdentity>(out NetworkIdentity identity))
if (identity == null)
{ {
Debug.LogError($"Could not unregister '{prefab.name}' since it contains no NetworkIdentity component"); Debug.LogError($"Could not unregister '{prefab.name}' since it contains no NetworkIdentity component");
return; return;
@ -1101,12 +1095,13 @@ static NetworkIdentity SpawnPrefab(SpawnMessage message)
Debug.LogError($"Spawn Handler returned null, Handler assetId '{message.assetId}'"); Debug.LogError($"Spawn Handler returned null, Handler assetId '{message.assetId}'");
return null; return null;
} }
NetworkIdentity identity = obj.GetComponent<NetworkIdentity>();
if (identity == null) if (!obj.TryGetComponent<NetworkIdentity>(out NetworkIdentity identity))
{ {
Debug.LogError($"Object Spawned by handler did not have a NetworkIdentity, Handler assetId '{message.assetId}'"); Debug.LogError($"Object Spawned by handler did not have a NetworkIdentity, Handler assetId '{message.assetId}'");
return null; return null;
} }
return identity; return identity;
} }