Skip to content

Commit 3997244

Browse files
NoelStephensUnityNoelStephensUnity
committed
fix: disabled NetworkBehaviours vs disabled GameObjects and tests excluded by lack of MP tools (#3761)
* fix Use the GameObject.activeInHierarchy fix. Allow disabled NetworkBehaviour with a disabled GameObject to internally start pre-spawn but exit before invoking protected method. * test - update Re-factoring this test to align with the previously committed fix. * tests - enable Now that we have included the Mutliplayer Tools package in the test project, we needed to remove the !MULTIPLAYER_TOOLS check to assure these tests are actually being run.
1 parent b754148 commit 3997244

File tree

11 files changed

+32
-50
lines changed

11 files changed

+32
-50
lines changed

‎com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviour.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -761,6 +761,13 @@ internal void NetworkPreSpawn(ref NetworkManager networkManager, NetworkObject n
761761

762762
UpdateNetworkProperties();
763763

764+
// Exit early for disabled NetworkBehaviours.
765+
// We still want the above values to be set.
766+
if (!gameObject.activeInHierarchy)
767+
{
768+
return;
769+
}
770+
764771
try
765772
{
766773
OnNetworkPreSpawn(ref networkManager);

‎com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2082,6 +2082,12 @@ internal void InvokeBehaviourOnNetworkObjectParentChanged(NetworkObject parentNe
20822082
{
20832083
for (int i = 0; i < ChildNetworkBehaviours.Count; i++)
20842084
{
2085+
// Any NetworkBehaviour that is not spawned and the associated GameObject is disabled should be
2086+
// skipped over (i.e. not supported).
2087+
if (!ChildNetworkBehaviours[i].IsSpawned && !ChildNetworkBehaviours[i].gameObject.activeInHierarchy)
2088+
{
2089+
continue;
2090+
}
20852091
// Invoke internal notification
20862092
ChildNetworkBehaviours[i].InternalOnNetworkObjectParentChanged(parentNetworkObject);
20872093
// Invoke public notification
@@ -2217,7 +2223,6 @@ public bool TrySetParent(NetworkObject parent, bool worldPositionStays = true)
22172223
// DANGO-TODO: Do we want to worry about ownership permissions here?
22182224
// It wouldn't make sense to not allow parenting, but keeping this note here as a reminder.
22192225
var isAuthority = HasAuthority || (AllowOwnerToParent && IsOwner);
2220-
Debug.Log($"something is broken! isAuthority={isAuthority} | HasAuthority={HasAuthority} | (AllowOwnerToParent && IsOwner)={(AllowOwnerToParent && IsOwner)}");
22212226

22222227
// If we don't have authority and we are not shutting down, then don't allow any parenting.
22232228
// If we are shutting down and don't have authority then allow it.
@@ -2543,10 +2548,7 @@ internal void InvokeBehaviourNetworkPreSpawn()
25432548
var networkManager = NetworkManager;
25442549
for (int i = 0; i < ChildNetworkBehaviours.Count; i++)
25452550
{
2546-
if (ChildNetworkBehaviours[i].gameObject.activeInHierarchy)
2547-
{
2548-
ChildNetworkBehaviours[i].NetworkPreSpawn(ref networkManager, this);
2549-
}
2551+
ChildNetworkBehaviours[i].NetworkPreSpawn(ref networkManager, this);
25502552
}
25512553
}
25522554

@@ -2558,10 +2560,9 @@ internal void InvokeBehaviourNetworkSpawn()
25582560
{
25592561
if (!childBehaviour.gameObject.activeInHierarchy)
25602562
{
2561-
Debug.LogWarning($"{childBehaviour.gameObject.name} is disabled! Netcode for GameObjects does not support spawning disabled NetworkBehaviours! The {childBehaviour.GetType().Name} component was skipped during spawn!");
2563+
Debug.LogWarning($"{GenerateDisabledNetworkBehaviourWarning(childBehaviour)}");
25622564
continue;
25632565
}
2564-
25652566
childBehaviour.InternalOnNetworkSpawn();
25662567
}
25672568
}
@@ -2621,7 +2622,7 @@ internal void InvokeBehaviourNetworkDespawn()
26212622

26222623
internal string GenerateDisabledNetworkBehaviourWarning(NetworkBehaviour networkBehaviour)
26232624
{
2624-
return $"[{name}][{networkBehaviour.GetType().Name}][{nameof(isActiveAndEnabled)}: {networkBehaviour.isActiveAndEnabled}] Disabled {nameof(NetworkBehaviour)}s are not supported and will be excluded from spawning and synchronization!";
2625+
return $"[{name}][{networkBehaviour.GetType().Name}][{nameof(isActiveAndEnabled)}: {networkBehaviour.isActiveAndEnabled}] Disabled {nameof(NetworkBehaviour)}s will be excluded from spawning and synchronization!";
26252626
}
26262627

26272628
internal List<NetworkBehaviour> ChildNetworkBehaviours
@@ -2644,11 +2645,6 @@ internal List<NetworkBehaviour> ChildNetworkBehaviours
26442645
{
26452646
continue;
26462647
}
2647-
else if (!networkBehaviours[i].isActiveAndEnabled)
2648-
{
2649-
Debug.LogWarning(GenerateDisabledNetworkBehaviourWarning(networkBehaviours[i]));
2650-
continue;
2651-
}
26522648

26532649
// Set ourselves as the NetworkObject that this behaviour belongs to and add it to the child list
26542650
var nextIndex = (ushort)m_ChildNetworkBehaviours.Count;

‎com.unity.netcode.gameobjects/Tests/Editor/Build/BuildTests.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#if !MULTIPLAYER_TOOLS
21
using System.IO;
32
using System.Reflection;
43
using NUnit.Framework;
@@ -41,4 +40,3 @@ public void BasicBuildTest()
4140
}
4241
}
4342
}
44-
#endif

‎com.unity.netcode.gameobjects/Tests/Runtime/NetworkBehaviourGenericTests.cs‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
using System.Collections;
2+
using System.Linq;
3+
using System.Text.RegularExpressions;
24
using NUnit.Framework;
35
using Unity.Netcode.Components;
46
using Unity.Netcode.TestHelpers.Runtime;
@@ -71,8 +73,8 @@ protected override void OnNewClientCreated(NetworkManager networkManager)
7173
/// is not deleted until a later time would cause an exception due to the
7274
/// NetworkBehaviour not being removed from the NetworkObject.ChildNetworkBehaviours
7375
/// list.
74-
/// - That when a child GameObject is deleted/disabled or a NetworkBehaviour is disabled
75-
/// a message is logged and the NetworkObject still can be spawned and synchronized.
76+
/// - When a NetworkBehaviour is disabled but the associated GameObject is enabled,
77+
/// the object spawns without any issues.
7678
/// </summary>
7779
[UnityTest]
7880
public IEnumerator ValidatedDisableddNetworkBehaviourWarning([Values] bool disableGameObject)
@@ -101,11 +103,18 @@ public IEnumerator ValidatedDisableddNetworkBehaviourWarning([Values] bool disab
101103
// Now create an instance of the prefab
102104
var instance = Object.Instantiate(m_PrefabToSpawn);
103105
var instanceNetworkObject = instance.GetComponent<NetworkObject>();
104-
// Generate the expected warning message
105-
var expectedWarning = instanceNetworkObject.GenerateDisabledNetworkBehaviourWarning(instanceNetworkObject.GetComponentInChildren<NetworkTransform>(true));
106+
// When the GameObject is disabled, check for the warning.
107+
if (disableGameObject)
108+
{
109+
// Generate the expected warning message
110+
var expectedWarning = instanceNetworkObject.GenerateDisabledNetworkBehaviourWarning(instanceNetworkObject.GetComponentInChildren<NetworkTransform>(true));
111+
var expectedSplit = expectedWarning.Split(']');
112+
var expectedWarningBody = expectedSplit.Last();
113+
LogAssert.Expect(LogType.Warning, new Regex($".*{expectedWarningBody}*."));
114+
}
115+
106116
// Spawn the instance
107117
SpawnObjectInstance(instanceNetworkObject, m_ServerNetworkManager);
108-
LogAssert.Expect(LogType.Warning, $"{expectedWarning}");
109118
// Asure the connected client spawned the object first
110119
yield return WaitForSpawnedOnAllOrTimeOut(instanceNetworkObject);
111120
AssertOnTimeout($"Not all clients spawned {instanceNetworkObject.name}!");

‎com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformBase.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,6 @@ internal class NetworkTransformTestComponent : NetworkTransform
781781

782782
protected override void OnAuthorityPushTransformState(ref NetworkTransformState networkTransformState)
783783
{
784-
Debug.Log($"[Auth]{name} State Pushed.");
785784
StatePushed = true;
786785
AuthorityLastSentState = networkTransformState;
787786
AuthorityPushedTransformState?.Invoke(ref networkTransformState);
@@ -792,7 +791,6 @@ protected override void OnAuthorityPushTransformState(ref NetworkTransformState
792791
public bool StateUpdated { get; internal set; }
793792
protected override void OnNetworkTransformStateUpdated(ref NetworkTransformState oldState, ref NetworkTransformState newState)
794793
{
795-
Debug.Log($"[Non-Auth]{name} State Updated.");
796794
StateUpdated = true;
797795
base.OnNetworkTransformStateUpdated(ref oldState, ref newState);
798796
}

‎com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformStateTests.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#if !MULTIPLAYER_TOOLS
21
using NUnit.Framework;
32
using Unity.Netcode.Components;
43
using Unity.Netcode.TestHelpers.Runtime;
@@ -916,4 +915,3 @@ public void TestThresholds(
916915
}
917916
}
918917
}
919-
#endif

‎com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformTests.cs‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,70 +13,57 @@ namespace Unity.Netcode.RuntimeTests
1313
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full, NetworkTransform.InterpolationTypes.LegacyLerp)]
1414
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full, NetworkTransform.InterpolationTypes.Lerp)]
1515
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full, NetworkTransform.InterpolationTypes.SmoothDampening)]
16-
#if !MULTIPLAYER_TOOLS
1716
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half, NetworkTransform.InterpolationTypes.LegacyLerp)]
1817
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.LegacyLerp)]
1918
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.LegacyLerp)]
2019
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.LegacyLerp)]
2120
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.LegacyLerp)]
22-
2321
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half, NetworkTransform.InterpolationTypes.Lerp)]
2422
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.Lerp)]
2523
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.Lerp)]
2624
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.Lerp)]
2725
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.Lerp)]
28-
2926
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half, NetworkTransform.InterpolationTypes.SmoothDampening)]
3027
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.SmoothDampening)]
3128
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.SmoothDampening)]
3229
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.SmoothDampening)]
3330
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.SmoothDampening)]
34-
35-
#endif
3631
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full, NetworkTransform.InterpolationTypes.LegacyLerp)]
3732
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full, NetworkTransform.InterpolationTypes.Lerp)]
3833
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full, NetworkTransform.InterpolationTypes.SmoothDampening)]
39-
#if !MULTIPLAYER_TOOLS
4034
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half, NetworkTransform.InterpolationTypes.LegacyLerp)]
4135
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.LegacyLerp)]
4236
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.LegacyLerp)]
4337
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.LegacyLerp)]
4438
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.LegacyLerp)]
45-
4639
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half, NetworkTransform.InterpolationTypes.Lerp)]
4740
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.Lerp)]
4841
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.Lerp)]
4942
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.Lerp)]
5043
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.Lerp)]
51-
5244
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half, NetworkTransform.InterpolationTypes.SmoothDampening)]
5345
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.SmoothDampening)]
5446
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.SmoothDampening)]
5547
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.SmoothDampening)]
5648
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.SmoothDampening)]
57-
#endif
5849
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full, NetworkTransform.InterpolationTypes.LegacyLerp)]
5950
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full, NetworkTransform.InterpolationTypes.Lerp)]
6051
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full, NetworkTransform.InterpolationTypes.SmoothDampening)]
61-
#if !MULTIPLAYER_TOOLS
6252
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half, NetworkTransform.InterpolationTypes.LegacyLerp)]
6353
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.LegacyLerp)]
6454
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.LegacyLerp)]
6555
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.LegacyLerp)]
6656
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.LegacyLerp)]
67-
6857
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half, NetworkTransform.InterpolationTypes.Lerp)]
6958
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.Lerp)]
7059
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.Lerp)]
7160
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.Lerp)]
7261
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.Lerp)]
73-
7462
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half, NetworkTransform.InterpolationTypes.SmoothDampening)]
7563
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.SmoothDampening)]
7664
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.SmoothDampening)]
7765
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.SmoothDampening)]
7866
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.SmoothDampening)]
79-
#endif
8067
internal class NetworkTransformTests : NetworkTransformBase
8168
{
8269
protected const int k_TickRate = 60;
@@ -162,8 +149,6 @@ private void AllChildrenLocalTransformValuesMatch(bool useSubChild, ChildrenTran
162149
}
163150
}
164151

165-
#if !MULTIPLAYER_TOOLS
166-
167152
private void UpdateTransformLocal(NetworkTransform networkTransformTestComponent)
168153
{
169154
networkTransformTestComponent.transform.localPosition += GetRandomVector3(0.5f, 2.0f);
@@ -698,7 +683,6 @@ public void LateJoiningPlayerInitialScaleValues([Values] TransformSpace testLoca
698683
}
699684
}
700685
}
701-
#endif
702686

703687
/// <summary>
704688
/// Tests changing all axial values one at a time.

‎com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableTests.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,7 @@ internal enum Serialization
216216
Default,
217217
}
218218

219-
#if !MULTIPLAYER_TOOLS
220219
[TestFixture(Serialization.EnsureLengthSafety)]
221-
#endif
222220
[TestFixture(Serialization.Default)]
223221
internal class NetworkVariableTests : NetcodeIntegrationTest
224222
{
@@ -339,7 +337,6 @@ private void InitializeServerAndClients(HostOrServer useHost)
339337
TimeTravelToNextTick();
340338
}
341339

342-
#if !MULTIPLAYER_TOOLS
343340
/// <summary>
344341
/// Runs generalized tests on all predefined NetworkVariable types
345342
/// </summary>
@@ -4884,4 +4881,3 @@ protected override IEnumerator OnTearDown()
48844881
}
48854882
}
48864883
}
4887-
#endif

‎com.unity.netcode.gameobjects/Tests/Runtime/Rpc/UniversalRpcTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !MULTIPLAYER_TOOLS && !NGO_MINIMALPROJECT
1+
#if !NGO_MINIMALPROJECT
22
using System;
33
using System.Collections;
44
using System.Collections.Generic;
@@ -1231,7 +1231,7 @@ private void RunTestTypeA(TestTypes testType)
12311231
{
12321232
foreach (var sendTo in sendToValues)
12331233
{
1234-
UnityEngine.Debug.Log($"[{testType}][{sendTo}]");
1234+
VerboseDebug($"[{testType}][{sendTo}]");
12351235
for (ulong objectOwner = 0; objectOwner <= numberOfClientsULong; objectOwner++)
12361236
{
12371237
for (ulong sender = 0; sender <= numberOfClientsULong; sender++)

‎com.unity.netcode.gameobjects/Tests/Runtime/Timing/TimeIntegrationTest.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#if !MULTIPLAYER_TOOLS
21
using System;
32
using System.Collections;
43
using NUnit.Framework;
@@ -200,4 +199,3 @@ public override int GetHashCode()
200199
}
201200
}
202201
}
203-
#endif

0 commit comments

Comments
 (0)