GabrielTofvesson/MLAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added further duplication checks to netconfig

Browse Source
This commit is contained in:
Albin Corén 2018-04-17 10:18:30 +02:00
parent 21b5942106
commit f8057144dc
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
MLAPI/MonoBehaviours/Core/NetworkingManager.cs
View File

@ -155,7 +155,7 @@ namespace MLAPI.MonoBehaviours.Core
{ {
if (NetworkConfig == null) if (NetworkConfig == null)
return; //May occur when the component is added return; //May occur when the component is added
if(NetworkConfig.EnableSceneSwitching && !NetworkConfig.RegisteredScenes.Contains(SceneManager.GetActiveScene().name)) if(NetworkConfig.EnableSceneSwitching && !NetworkConfig.RegisteredScenes.Contains(SceneManager.GetActiveScene().name))
{ {
Debug.LogWarning("MLAPI: The active scene is not registered as a networked scene. The MLAPI has added it"); Debug.LogWarning("MLAPI: The active scene is not registered as a networked scene. The MLAPI has added it");
@ -252,10 +252,17 @@ namespace MLAPI.MonoBehaviours.Core
NetworkConfig.NetworkPrefabIds = new Dictionary<string, int>(); NetworkConfig.NetworkPrefabIds = new Dictionary<string, int>();
NetworkConfig.NetworkPrefabNames = new Dictionary<int, string>(); NetworkConfig.NetworkPrefabNames = new Dictionary<int, string>();
NetworkConfig.NetworkedPrefabs.OrderBy(x => x.name); NetworkConfig.NetworkedPrefabs.OrderBy(x => x.name);
HashSet<string> networkedPrefabName = new HashSet<string>();
for (int i = 0; i < NetworkConfig.NetworkedPrefabs.Count; i++) for (int i = 0; i < NetworkConfig.NetworkedPrefabs.Count; i++)
{ {
if (networkedPrefabName.Contains(NetworkConfig.NetworkedPrefabs[i].name))
{
Debug.LogWarning("MLAPI: Duplicate NetworkedPrefabName " + NetworkConfig.NetworkedPrefabs[i].name);
continue;
}
NetworkConfig.NetworkPrefabIds.Add(NetworkConfig.NetworkedPrefabs[i].name, i); NetworkConfig.NetworkPrefabIds.Add(NetworkConfig.NetworkedPrefabs[i].name, i);
NetworkConfig.NetworkPrefabNames.Add(i, NetworkConfig.NetworkedPrefabs[i].name); NetworkConfig.NetworkPrefabNames.Add(i, NetworkConfig.NetworkedPrefabs[i].name);
networkedPrefabName.Add(NetworkConfig.NetworkedPrefabs[i].name);
} }
if (NetworkConfig.EnableSceneSwitching) if (NetworkConfig.EnableSceneSwitching)
{ {
@ -321,22 +328,38 @@ namespace MLAPI.MonoBehaviours.Core
if (NetworkConfig.EnableEncryption) if (NetworkConfig.EnableEncryption)
{ {
HashSet<string> addedEncryptedChannels = new HashSet<string>();
for (int i = 0; i < NetworkConfig.Channels.Count; i++) for (int i = 0; i < NetworkConfig.Channels.Count; i++)
{ {
if (addedEncryptedChannels.Contains(NetworkConfig.Channels[i].Name))
{
Debug.LogWarning("MLAPI: Duplicate encrypted channel name " + NetworkConfig.Channels[i].Name);
continue;
}
if (NetworkConfig.Channels[i].Encrypted) if (NetworkConfig.Channels[i].Encrypted)
{ {
NetworkConfig.EncryptedChannels.Add(NetworkConfig.Channels[i].Name); NetworkConfig.EncryptedChannels.Add(NetworkConfig.Channels[i].Name);
NetworkConfig.EncryptedChannelsHashSet.Add(NetworkConfig.Channels[i].Name); NetworkConfig.EncryptedChannelsHashSet.Add(NetworkConfig.Channels[i].Name);
} }
addedEncryptedChannels.Add(NetworkConfig.Channels[i].Name);
} }
} }
if (NetworkConfig.AllowPassthroughMessages) if (NetworkConfig.AllowPassthroughMessages)
{ {
HashSet<string> addedPassthroughMessages = new HashSet<string>();
for (int i = 0; i < NetworkConfig.MessageTypes.Count; i++) for (int i = 0; i < NetworkConfig.MessageTypes.Count; i++)
{ {
if (addedPassthroughMessages.Contains(NetworkConfig.MessageTypes[i].Name))
{
Debug.LogWarning("MLAPI: Duplicate passthrough message type " + NetworkConfig.MessageTypes[i].Name);
continue;
}
if (NetworkConfig.MessageTypes[i].Passthrough) if (NetworkConfig.MessageTypes[i].Passthrough)
{
NetworkConfig.PassthroughMessageHashSet.Add(MessageManager.messageTypes[NetworkConfig.MessageTypes[i].Name]); NetworkConfig.PassthroughMessageHashSet.Add(MessageManager.messageTypes[NetworkConfig.MessageTypes[i].Name]);
addedPassthroughMessages.Add(NetworkConfig.MessageTypes[i].Name);
}
} }
} }