Skip to content

chore: minor coding standards fixes #750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
0xFA11 merged 1 commit into from
Apr 19, 2021
Merged

chore: minor coding standards fixes #750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions com.unity.multiplayer.mlapi/Runtime/Messaging/CustomMessageManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,22 +82,22 @@ public void SendUnnamedMessage(ulong clientId, NetworkBuffer buffer, NetworkChan
/// </summary>
public delegate void HandleNamedMessageDelegate(ulong sender, Stream payload);

private Dictionary<ulong, HandleNamedMessageDelegate> s_NamedMessageHandlers32 = new Dictionary<ulong, HandleNamedMessageDelegate>();
private Dictionary<ulong, HandleNamedMessageDelegate> s_NamedMessageHandlers64 = new Dictionary<ulong, HandleNamedMessageDelegate>();
private Dictionary<ulong, HandleNamedMessageDelegate> m_NamedMessageHandlers32 = new Dictionary<ulong, HandleNamedMessageDelegate>();
private Dictionary<ulong, HandleNamedMessageDelegate> m_NamedMessageHandlers64 = new Dictionary<ulong, HandleNamedMessageDelegate>();

internal void InvokeNamedMessage(ulong hash, ulong sender, Stream stream)
{
if (m_NetworkManager == null)
{
// We dont know what size to use. Try every (more collision prone)
if (s_NamedMessageHandlers32.ContainsKey(hash))
if (m_NamedMessageHandlers32.ContainsKey(hash))
{
s_NamedMessageHandlers32[hash](sender, stream);
m_NamedMessageHandlers32[hash](sender, stream);
}

if (s_NamedMessageHandlers64.ContainsKey(hash))
if (m_NamedMessageHandlers64.ContainsKey(hash))
{
s_NamedMessageHandlers64[hash](sender, stream);
m_NamedMessageHandlers64[hash](sender, stream);
}
}
else
Expand All @@ -106,15 +106,15 @@ internal void InvokeNamedMessage(ulong hash, ulong sender, Stream stream)
switch (m_NetworkManager.NetworkConfig.RpcHashSize)
{
case HashSize.VarIntFourBytes:
if (s_NamedMessageHandlers32.ContainsKey(hash))
if (m_NamedMessageHandlers32.ContainsKey(hash))
{
s_NamedMessageHandlers32[hash](sender, stream);
m_NamedMessageHandlers32[hash](sender, stream);
}
break;
case HashSize.VarIntEightBytes:
if (s_NamedMessageHandlers64.ContainsKey(hash))
if (m_NamedMessageHandlers64.ContainsKey(hash))
{
s_NamedMessageHandlers64[hash](sender, stream);
m_NamedMessageHandlers64[hash](sender, stream);
}
break;
}
Expand All @@ -128,8 +128,8 @@ internal void InvokeNamedMessage(ulong hash, ulong sender, Stream stream)
/// <param name="callback">The callback to run when a named message is received.</param>
public void RegisterNamedMessageHandler(string name, HandleNamedMessageDelegate callback)
{
s_NamedMessageHandlers32[XXHash.Hash32(name)] = callback;
s_NamedMessageHandlers64[XXHash.Hash64(name)] = callback;
m_NamedMessageHandlers32[XXHash.Hash32(name)] = callback;
m_NamedMessageHandlers64[XXHash.Hash64(name)] = callback;
}

/// <summary>
Expand All @@ -138,8 +138,8 @@ public void RegisterNamedMessageHandler(string name, HandleNamedMessageDelegate
/// <param name="name">The name of the message.</param>
public void UnregisterNamedMessageHandler(string name)
{
s_NamedMessageHandlers32.Remove(XXHash.Hash32(name));
s_NamedMessageHandlers64.Remove(XXHash.Hash64(name));
m_NamedMessageHandlers32.Remove(XXHash.Hash32(name));
m_NamedMessageHandlers64.Remove(XXHash.Hash64(name));
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerCustomMessageManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public void CustomMessageManagerAssigned()
networkManager.NetworkConfig = new NetworkConfig()
{
// Set the current scene to prevent unexpected log messages which would trigger a failure
RegisteredScenes = new List<string>() {SceneManager.GetActiveScene().name}
RegisteredScenes = new List<string>() { SceneManager.GetActiveScene().name }
};

// Set dummy transport that does nothing
Expand Down
2 changes: 1 addition & 1 deletion com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerMessageHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public void MessageHandlerReceivedMessageServerClient()
networkManager.NetworkConfig = new NetworkConfig()
{
// Set the current scene to prevent unexpected log messages which would trigger a failure
RegisteredScenes = new List<string>() {SceneManager.GetActiveScene().name}
RegisteredScenes = new List<string>() { SceneManager.GetActiveScene().name }
};

// Set dummy transport that does nothing
Expand Down