Skip to content

Commit 78b50c7

Browse files
noellie-veleznoellie-velez
committed
chore: use correct log level and type
1 parent 2e4f489 commit 78b50c7

File tree

1 file changed

+34
-32
lines changed

1 file changed

+34
-32
lines changed

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

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1473,6 +1473,7 @@ internal NetworkSceneHandle GetSceneOriginHandle()
14731473
/// Usage: Use to start sending updates for a previously hidden <see cref="NetworkObject"/> to the targeted client.<br />
14741474
/// <br />
14751475
/// Dynamically Spawned: <see cref="NetworkObject"/>s will be instantiated and spawned on the targeted client side.<br />
1476+
/// CHECK comment, is a despawned object spawned on the client side? I thought it wasn't
14761477
/// In-Scene Placed: The instantiated but despawned <see cref="NetworkObject"/>s will be spawned on the targeted client side.<br />
14771478
/// <br />
14781479
/// See Also:<br />
@@ -1484,26 +1485,26 @@ public void NetworkShow(ulong clientId)
14841485
{
14851486
if (!IsSpawned)
14861487
{
1487-
if (NetworkManagerOwner.LogLevel <= LogLevel.Normal)
1488+
if (NetworkManagerOwner.LogLevel <= LogLevel.Error)
14881489
{
1489-
NetworkLog.LogWarning($"Trying to show {name} but is not spawned!");
1490+
NetworkLog.LogErrorServer($"Trying to show {name} but it is not spawned!");
14901491
}
14911492
}
14921493

14931494
if (!HasAuthority)
14941495
{
14951496
if (NetworkManagerOwner.DistributedAuthorityMode)
14961497
{
1497-
if (NetworkManagerOwner.LogLevel <= LogLevel.Normal)
1498+
if (NetworkManagerOwner.LogLevel <= LogLevel.Error)
14981499
{
1499-
NetworkLog.LogWarning($"Only the owner-authority of {name} can change it's visibility when distributed authority mode is enabled!");
1500+
NetworkLog.LogError($"[{name}] Only the owner-authority can change visibility when distributed authority mode is enabled!");
15001501
}
15011502
}
15021503
else
15031504
{
1504-
if (NetworkManagerOwner.LogLevel <= LogLevel.Normal)
1505+
if (NetworkManagerOwner.LogLevel <= LogLevel.Error)
15051506
{
1506-
NetworkLog.LogWarning($"Only the authority of {name} can change it's visibility!");
1507+
NetworkLog.LogError($"[{name}] Only the authority can change visibility!");
15071508
}
15081509
}
15091510
}
@@ -1513,17 +1514,18 @@ public void NetworkShow(ulong clientId)
15131514
{
15141515
if (NetworkManagerOwner.DistributedAuthorityMode)
15151516
{
1516-
if (NetworkManagerOwner.LogLevel <= LogLevel.Normal)
1517+
if (NetworkManagerOwner.LogLevel <= LogLevel.Error)
15171518
{
1518-
NetworkLog.LogError($"The object {name} is already visible to Client-{clientId}!");
1519+
NetworkLog.LogErrorServer($"The object {name} is already visible to Client-{clientId}!");
15191520
}
15201521
return;
15211522
}
15221523
else
15231524
{
1524-
if (NetworkManagerOwner.LogLevel <= LogLevel.Normal)
1525+
if (NetworkManagerOwner.LogLevel <= LogLevel.Error)
15251526
{
1526-
NetworkLog.LogWarning($"Only the server of {name} can change it's visibility!");
1527+
NetworkLog.LogError($"[{name}] Only the server can change visibility!");
1528+
return;
15271529
}
15281530
}
15291531
}
@@ -1589,7 +1591,7 @@ public void NetworkHide(ulong clientId)
15891591
{
15901592
if (NetworkManager.LogLevel <= LogLevel.Error)
15911593
{
1592-
NetworkLog.LogErrorServer($"[{name}][Attempted NetworkHide while {nameof(NetworkObject)} is not spawned!]");
1594+
NetworkLog.LogErrorServer($"[{name}] Attempted NetworkHide while {nameof(NetworkObject)} is not spawned!");
15931595
}
15941596
}
15951597

@@ -1599,14 +1601,14 @@ public void NetworkHide(ulong clientId)
15991601
{
16001602
if (NetworkManager.LogLevel <= LogLevel.Error)
16011603
{
1602-
NetworkLog.LogErrorServer($"[{name}][Only the owner-authority can change visibility when distributed authority mode is enabled!]");
1604+
NetworkLog.LogError($"[{name}] Only the owner-authority can change visibility when distributed authority mode is enabled!");
16031605
}
16041606
}
16051607
else
16061608
{
16071609
if (NetworkManager.LogLevel <= LogLevel.Error)
16081610
{
1609-
NetworkLog.LogErrorServer($"[{name}][Only the authority can change visibility!]");
1611+
NetworkLog.LogError($"[{name}] Only the authority can change visibility!");
16101612
}
16111613
}
16121614
}
@@ -1617,7 +1619,7 @@ public void NetworkHide(ulong clientId)
16171619
{
16181620
if (NetworkManagerOwner.LogLevel <= LogLevel.Developer)
16191621
{
1620-
NetworkLog.LogWarning($"[{name}][{nameof(NetworkObject)} already hidden from Client-{clientId}! (ignoring)]");
1622+
NetworkLog.LogWarning($"[{name}] {nameof(NetworkObject)} already hidden from Client-{clientId}! (ignoring)");
16211623
}
16221624
return;
16231625
}
@@ -1752,26 +1754,26 @@ internal void SpawnInternal(bool destroyWithScene, ulong ownerClientId, bool pla
17521754

17531755
if (!NetworkManagerOwner.IsListening)
17541756
{
1755-
if (NetworkManagerOwner.LogLevel <= LogLevel.Developer)
1757+
if (NetworkManagerOwner.LogLevel <= LogLevel.Error)
17561758
{
1757-
NetworkLog.LogErrorServer($"[{name}][{nameof(NetworkManagerOwner)} is not listening, start a server or host before spawning objects]");
1759+
NetworkLog.LogError($"[{name}] {nameof(NetworkManagerOwner)} is not listening, start a server or host before spawning objects.");
17581760
}
17591761
}
17601762

17611763
if ((!NetworkManagerOwner.IsServer && !NetworkManagerOwner.DistributedAuthorityMode) || (NetworkManagerOwner.DistributedAuthorityMode && !NetworkManagerOwner.LocalClient.IsSessionOwner && NetworkManagerOwner.LocalClientId != ownerClientId))
17621764
{
17631765
if (NetworkManagerOwner.DistributedAuthorityMode)
17641766
{
1765-
if (NetworkManagerOwner.LogLevel <= LogLevel.Developer)
1767+
if (NetworkManagerOwner.LogLevel <= LogLevel.Error)
17661768
{
1767-
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}!]");
1769+
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}!");
17681770
}
17691771
}
17701772
else
17711773
{
1772-
if (NetworkManagerOwner.LogLevel <= LogLevel.Developer)
1774+
if (NetworkManagerOwner.LogLevel <= LogLevel.Error)
17731775
{
1774-
NetworkLog.LogError($"[{name}][Only server can spawn {nameof(NetworkObject)}s]");
1776+
NetworkLog.LogError($"[{name}] Only server can spawn {nameof(NetworkObject)}s.");
17751777
}
17761778
}
17771779
}
@@ -2293,9 +2295,9 @@ private void OnTransformParentChanged()
22932295
return;
22942296
}
22952297
transform.parent = m_CachedParent;
2296-
if (NetworkManagerOwner.LogLevel <= LogLevel.Developer)
2298+
if (NetworkManagerOwner.LogLevel <= LogLevel.Error)
22972299
{
2298-
NetworkLog.LogError($"[{name}] {nameof(networkManager)} is not listening, start a server or host before re-parenting");
2300+
NetworkLog.LogError($"[{name}] {nameof(networkManager)} is not listening, start a server or host before re-parenting.");
22992301
}
23002302
return;
23012303
}
@@ -2313,9 +2315,9 @@ private void OnTransformParentChanged()
23132315
else
23142316
{
23152317
transform.parent = m_CachedParent;
2316-
if (NetworkManagerOwner.LogLevel <= LogLevel.Developer)
2318+
if (NetworkManagerOwner.LogLevel <= LogLevel.Error)
23172319
{
2318-
NetworkLog.LogError($"[{name}] {nameof(NetworkObject)} can only be re-parented after being spawned!");
2320+
NetworkLog.LogErrorServer($"[{name}] {nameof(NetworkObject)} can only be re-parented after being spawned!");
23192321
}
23202322
}
23212323
return;
@@ -2332,16 +2334,16 @@ private void OnTransformParentChanged()
23322334
{
23332335
if (networkManager.DistributedAuthorityMode)
23342336
{
2335-
if (NetworkManagerOwner.LogLevel <= LogLevel.Developer)
2337+
if (NetworkManagerOwner.LogLevel <= LogLevel.Error)
23362338
{
23372339
NetworkLog.LogError($"[{name}][Not Owner] Only the owner-authority of child {gameObject.name}'s {nameof(NetworkObject)} component can re-parent it!");
23382340
}
23392341
}
23402342
else
23412343
{
2342-
if (NetworkManagerOwner.LogLevel <= LogLevel.Developer)
2344+
if (NetworkManagerOwner.LogLevel <= LogLevel.Error)
23432345
{
2344-
NetworkLog.LogError($"[{name}] Only the server can re-parent {nameof(NetworkObject)}s");
2346+
NetworkLog.LogError($"[{name}] Only the server can re-parent {nameof(NetworkObject)}s.");
23452347
}
23462348
}
23472349
}
@@ -2356,19 +2358,19 @@ private void OnTransformParentChanged()
23562358
{
23572359
transform.parent = m_CachedParent;
23582360
AuthorityAppliedParenting = false;
2359-
if (NetworkManagerOwner.LogLevel <= LogLevel.Developer)
2361+
if (NetworkManagerOwner.LogLevel <= LogLevel.Error)
23602362
{
2361-
NetworkLog.LogError($"[{name}] Invalid parenting, {nameof(NetworkObject)} moved under a non-{nameof(NetworkObject)} parent");
2363+
NetworkLog.LogErrorServer($"[{name}] Invalid parenting, {nameof(NetworkObject)} moved under a non-{nameof(NetworkObject)} parent");
23622364
}
23632365
return;
23642366
}
23652367
else if (!parentObject.IsSpawned)
23662368
{
23672369
transform.parent = m_CachedParent;
23682370
AuthorityAppliedParenting = false;
2369-
if (NetworkManagerOwner.LogLevel <= LogLevel.Developer)
2371+
if (NetworkManagerOwner.LogLevel <= LogLevel.Error)
23702372
{
2371-
NetworkLog.LogError($"[{name}] {nameof(NetworkObject)} can only be re-parented under another spawned {nameof(NetworkObject)}");
2373+
NetworkLog.LogErrorServer($"[{name}] {nameof(NetworkObject)} can only be re-parented under another spawned {nameof(NetworkObject)}.");
23722374
}
23732375
return;
23742376
}
@@ -3388,7 +3390,7 @@ internal static NetworkObject Deserialize(in SerializedObject serializedObject,
33883390
// Spawn the NetworkObject
33893391
if (networkObject.IsSpawned)
33903392
{
3391-
if (NetworkManager.Singleton.LogLevel <= LogLevel.Developer)
3393+
if (NetworkManager.Singleton.LogLevel <= LogLevel.Error)
33923394
{
33933395
NetworkLog.LogErrorServer($"[{networkObject.name}] Object-{networkObject.NetworkObjectId} is already spawned!");
33943396
}

0 commit comments

Comments
 (0)