Skip to content

Commit 9a0b665

Browse files
committed
NotListeningException marked obsolete + fix test
1 parent 667b22f commit 9a0b665

File tree

3 files changed

+25
-12
lines changed

3 files changed

+25
-12
lines changed

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

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1488,6 +1488,7 @@ public void NetworkShow(ulong clientId)
14881488
{
14891489
NetworkLog.LogErrorServer($"[{name}] Attempted NetworkShow while not spawned.");
14901490
}
1491+
return;
14911492
}
14921493

14931494
if (!HasAuthority)
@@ -1498,13 +1499,15 @@ public void NetworkShow(ulong clientId)
14981499
{
14991500
NetworkLog.LogError($"[{name}] Only the owner-authority can change visibility when distributed authority mode is enabled!");
15001501
}
1502+
return;
15011503
}
15021504
else
15031505
{
15041506
if (NetworkManagerOwner.LogLevel <= LogLevel.Error)
15051507
{
15061508
NetworkLog.LogError($"[{name}] Only the authority can change visibility.");
15071509
}
1510+
return;
15081511
}
15091512
}
15101513

@@ -1523,8 +1526,8 @@ public void NetworkShow(ulong clientId)
15231526
if (NetworkManagerOwner.LogLevel <= LogLevel.Error)
15241527
{
15251528
NetworkLog.LogError($"[{name}] Only the server can change visibility.");
1526-
return;
15271529
}
1530+
return;
15281531
}
15291532
}
15301533

@@ -1591,6 +1594,7 @@ public void NetworkHide(ulong clientId)
15911594
{
15921595
NetworkLog.LogErrorServer($"[{name}] Attempted NetworkHide while {nameof(NetworkObject)} is not spawned.");
15931596
}
1597+
return;
15941598
}
15951599

15961600
if (!HasAuthority && !NetworkManagerOwner.DAHost)
@@ -1601,13 +1605,15 @@ public void NetworkHide(ulong clientId)
16011605
{
16021606
NetworkLog.LogError($"[{name}] Only the owner-authority can change visibility when distributed authority mode is enabled!");
16031607
}
1608+
return;
16041609
}
16051610
else
16061611
{
16071612
if (NetworkManager.LogLevel <= LogLevel.Error)
16081613
{
16091614
NetworkLog.LogError($"[{name}] Only the authority can change visibility!");
16101615
}
1616+
return;
16111617
}
16121618
}
16131619

@@ -1756,6 +1762,7 @@ internal void SpawnInternal(bool destroyWithScene, ulong ownerClientId, bool pla
17561762
{
17571763
NetworkLog.LogError($"[{name}] {nameof(NetworkManagerOwner)} is not listening, start a server or host before spawning objects.");
17581764
}
1765+
return;
17591766
}
17601767

17611768
if ((!NetworkManagerOwner.IsServer && !NetworkManagerOwner.DistributedAuthorityMode) || (NetworkManagerOwner.DistributedAuthorityMode && !NetworkManagerOwner.LocalClient.IsSessionOwner && NetworkManagerOwner.LocalClientId != ownerClientId))
@@ -1766,13 +1773,15 @@ internal void SpawnInternal(bool destroyWithScene, ulong ownerClientId, bool pla
17661773
{
17671774
NetworkLog.LogError($"[{name}] When distributed authority mode is enabled, you can only spawn NetworkObjects that belong to the local instance! Local instance id {NetworkManagerOwner.LocalClientId} is not the same as the assigned owner id: {ownerClientId}!");
17681775
}
1776+
return;
17691777
}
17701778
else
17711779
{
17721780
if (NetworkManagerOwner.LogLevel <= LogLevel.Error)
17731781
{
17741782
NetworkLog.LogError($"[{name}] Only server can spawn {nameof(NetworkObject)}s.");
17751783
}
1784+
return;
17761785
}
17771786
}
17781787

@@ -2332,17 +2341,11 @@ private void OnTransformParentChanged()
23322341
{
23332342
if (networkManager.DistributedAuthorityMode)
23342343
{
2335-
if (NetworkManagerOwner.LogLevel <= LogLevel.Error)
2336-
{
2337-
NetworkLog.LogError($"[{name}][Not Owner] Only the owner-authority of child {gameObject.name}'s {nameof(NetworkObject)} component can re-parent it!");
2338-
}
2344+
NetworkLog.LogError($"[{name}][Not Owner] Only the owner-authority of child {gameObject.name}'s {nameof(NetworkObject)} component can re-parent it!");
23392345
}
23402346
else
23412347
{
2342-
if (NetworkManagerOwner.LogLevel <= LogLevel.Error)
2343-
{
2344-
NetworkLog.LogError($"[{name}] Only the server can re-parent {nameof(NetworkObject)}s.");
2345-
}
2348+
NetworkLog.LogError($"[{name}] Only the server can re-parent {nameof(NetworkObject)}s.");
23462349
}
23472350
}
23482351
return;
@@ -3050,7 +3053,11 @@ public void Serialize(FastBufferWriter writer)
30503053

30513054
if (!writer.TryBeginWrite(writeSize))
30523055
{
3053-
throw new OverflowException("Could not serialize SceneObject: Out of buffer space.");
3056+
if (NetworkManager.Singleton.LogLevel <= LogLevel.Error)
3057+
{
3058+
NetworkLog.LogError("Could not serialize SceneObject: Out of buffer space.");
3059+
}
3060+
return;
30543061
}
30553062

30563063
if (HasTransform)
@@ -3137,7 +3144,11 @@ public void Deserialize(FastBufferReader reader)
31373144
// Try to begin reading the remaining bytes
31383145
if (!reader.TryBeginRead(readSize))
31393146
{
3140-
throw new OverflowException("Could not deserialize SceneObject: Reading past the end of the buffer");
3147+
if (NetworkManager.Singleton.LogLevel <= LogLevel.Error)
3148+
{
3149+
NetworkLog.LogError("Could not deserialize SceneObject: Reading past the end of the buffer.");
3150+
}
3151+
return;
31413152
}
31423153

31433154
if (HasTransform)
@@ -3389,6 +3400,7 @@ internal static NetworkObject Deserialize(in SerializedObject serializedObject,
33893400
{
33903401
NetworkLog.LogErrorServer($"[{networkObject.name}] Object-{networkObject.NetworkObjectId} is already spawned!");
33913402
}
3403+
return null;
33923404
}
33933405

33943406
// Invoke the non-authority local spawn method

com.unity.netcode.gameobjects/Runtime/Exceptions/NotListeningException.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ namespace Unity.Netcode
55
/// <summary>
66
/// Exception thrown when the operation require NetworkManager to be listening.
77
/// </summary>
8+
[Obsolete("Not used anymore.")]
89
public class NotListeningException : Exception
910
{
1011
/// <summary>

testproject/Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public void SetupSet(Transform rootTransform, int setIndex, NetworkManager netwo
207207
Assert.That(m_Pickup_NetObjs[setIndex], Is.Not.Null);
208208
Assert.That(m_Pickup_Back_NetObjs[setIndex], Is.Not.Null);
209209

210-
LogAssert.Expect(LogType.Exception, new Regex("start a server or host", RegexOptions.IgnoreCase));
210+
LogAssert.Expect(LogType.Error, new Regex("start a server or host", RegexOptions.IgnoreCase));
211211
var cachedParent = m_Cube_NetObjs[setIndex].parent;
212212
m_Cube_NetObjs[setIndex].parent = m_Pickup_NetObjs[setIndex];
213213
Assert.That(m_Cube_NetObjs[setIndex].parent, Is.EqualTo(cachedParent), $"Transform {m_Cube_NetObjs[setIndex].parent.name} is not equal to transform {cachedParent.name}");

0 commit comments

Comments
 (0)