Skip to content

Commit 5e41c0c

Browse files
committed
Fix the tests
1 parent 753cb16 commit 5e41c0c

3 files changed

Lines changed: 12 additions & 4 deletions

File tree

com.unity.netcode.gameobjects/Runtime/Logging/LogBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ internal class LogBuilder
77
private readonly StringBuilder m_Builder = new();
88
private const string k_OpenBracket = "[";
99
private const string k_CloseBracket = "]";
10-
private const string k_Separator = ": ";
10+
private const string k_Separator = ":";
1111

1212
public void Reset()
1313
{

com.unity.netcode.gameobjects/Runtime/Messaging/Messages/RpcMessages.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ public static unsafe bool Deserialize(ref FastBufferReader reader, ref NetworkCo
3636
public static void Handle(ref NetworkContext context, ref RpcMetadata metadata, ref FastBufferReader payload, ref __RpcParams rpcParams)
3737
{
3838
var networkManager = (NetworkManager)context.SystemOwner;
39-
using var logContext = networkManager.Log.AddDisposableInfo("SenderClientId", context.SenderId);
4039

4140
if (!networkManager.SpawnManager.SpawnedObjects.TryGetValue(metadata.NetworkObjectId, out var networkObject))
4241
{
@@ -68,7 +67,7 @@ public static void Handle(ref NetworkContext context, ref RpcMetadata metadata,
6867
if ((permission == RpcInvokePermission.Server && rpcParams.SenderId != NetworkManager.ServerClientId) ||
6968
(permission == RpcInvokePermission.Owner && rpcParams.SenderId != networkObject.OwnerClientId))
7069
{
71-
networkManager.Log.ErrorServer(new Context(LogLevel.Normal, "Rpc message received from a client permission to perform this operation!. Dropping RPC message").AddNetworkBehaviour(networkBehaviour));
70+
networkManager.Log.ErrorServer(new Context(LogLevel.Normal, "Rpc message received from a client without permission to perform this operation!. Dropping RPC message").AddNetworkBehaviour(networkBehaviour));
7271
return;
7372
}
7473

com.unity.netcode.gameobjects/Tests/Runtime/Rpc/RpcInvocationTests.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,16 @@ public IEnumerator RpcInvokePermissionSendingTests()
139139
[UnityTest]
140140
public IEnumerator RpcInvokePermissionReceivingTests()
141141
{
142-
var firstClient = GetNonAuthorityNetworkManager(0);
142+
NetworkManager firstClient = null;
143+
foreach (var networkManager in m_NetworkManagers)
144+
{
145+
if (firstClient == null && !networkManager.IsServer && !networkManager.LocalClient.IsSessionOwner)
146+
{
147+
firstClient = networkManager;
148+
}
149+
150+
networkManager.LogLevel = LogLevel.Error;
151+
}
143152

144153
var spawnedObject = SpawnObject(m_Prefab, firstClient).GetComponent<NetworkObject>();
145154

0 commit comments

Comments
 (0)