Skip to content

Commit 589882c

Browse files
authored
refactor: calling networkShow(NetworkObject) code in networkshow(List<NetworkObject>) (#1028)
* refactor: calling networkShow(NetworkObject) code in networkshow(List<NetworkObject>) instead of calling a deeper-nested function. Make the code more uniform and prepares for incoming snapshot changes * style: whitespace * refactor: also using NetworkHide(NetworkObject) to implement NetworkHide(List<NetworkObject>). Same reasons as for NetworkShow
1 parent 01ad0c2 commit 589882c

File tree

1 file changed

+4
-34
lines changed

1 file changed

+4
-34
lines changed

com.unity.multiplayer.mlapi/Runtime/Core/NetworkObject.cs

Lines changed: 4 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -278,25 +278,9 @@ public static void NetworkShow(List<NetworkObject> networkObjects, ulong clientI
278278
}
279279
}
280280

281-
282-
var context = networkManager.MessageQueueContainer.EnterInternalCommandContext(
283-
MessageQueueContainer.MessageType.CreateObjects, NetworkChannel.Internal,
284-
new[] { clientId }, NetworkUpdateLoop.UpdateStage);
285-
286-
if (context != null)
281+
foreach (var networkObject in networkObjects)
287282
{
288-
using (var nonNullContext = (InternalCommandContext)context)
289-
{
290-
nonNullContext.NetworkWriter.WriteUInt16Packed((ushort)networkObjects.Count);
291-
292-
for (int i = 0; i < networkObjects.Count; i++)
293-
{
294-
networkObjects[i].Observers.Add(clientId);
295-
296-
networkManager.SpawnManager.WriteSpawnCallForObject(nonNullContext.NetworkWriter, clientId,
297-
networkObjects[i]);
298-
}
299-
}
283+
networkObject.NetworkShow(clientId);
300284
}
301285
}
302286

@@ -385,23 +369,9 @@ public static void NetworkHide(List<NetworkObject> networkObjects, ulong clientI
385369
}
386370
}
387371

388-
var context = networkManager.MessageQueueContainer.EnterInternalCommandContext(
389-
MessageQueueContainer.MessageType.DestroyObjects, NetworkChannel.Internal,
390-
new[] { clientId }, NetworkUpdateStage.PostLateUpdate);
391-
if (context != null)
372+
foreach (var networkObject in networkObjects)
392373
{
393-
using (var nonNullContext = (InternalCommandContext)context)
394-
{
395-
nonNullContext.NetworkWriter.WriteUInt16Packed((ushort)networkObjects.Count);
396-
397-
for (int i = 0; i < networkObjects.Count; i++)
398-
{
399-
// Send destroy call
400-
networkObjects[i].Observers.Remove(clientId);
401-
402-
nonNullContext.NetworkWriter.WriteUInt64Packed(networkObjects[i].NetworkObjectId);
403-
}
404-
}
374+
networkObject.NetworkHide(clientId);
405375
}
406376
}
407377

0 commit comments

Comments
 (0)