com.adrenak.univoice 4.10.3 → 4.10.5

package/Runtime/Impl/Networks/FishNet/FishNetClient.cs

@@ -183,9 +183,15 @@ namespace Adrenak.UniVoice.Networks
             writer.WriteIntArray(YourVoiceSettings.mutedPeers.ToArray());
             writer.WriteInt(YourVoiceSettings.deafenAll ? 1 : 0);
             writer.WriteIntArray(YourVoiceSettings.deafenedPeers.ToArray());
-            writer.WriteString(string.Join(",", YourVoiceSettings.myTags));
-            writer.WriteString(string.Join(",", YourVoiceSettings.mutedTags));
-            writer.WriteString(string.Join(",", YourVoiceSettings.deafenedTags));
+            
+            var myTags = YourVoiceSettings.myTags;
+            writer.WriteString(myTags.Count == 0 ? "," : string.Join(",", myTags));
+            
+            var mutedTags = YourVoiceSettings.mutedTags;
+            writer.WriteString(mutedTags.Count == 0 ? "," : string.Join(",", mutedTags));
+
+            var deafenedTags = YourVoiceSettings.deafenedTags;
+            writer.WriteString(deafenedTags.Count == 0 ? "," : string.Join(",", deafenedTags));
 
             var message = new FishNetBroadcast() {
                 data = writer.Bytes

package/Runtime/Impl/Networks/FishNet/FishNetServer.cs

@@ -164,7 +164,7 @@ namespace Adrenak.UniVoice.Networks
                             continue;
 
                         // If the peer has muted the sender using tag, skip sending audio
-                        if (recipientSettings.mutedTags.Intersect(senderSettings.myTags).Any())
+                        if (senderSettings != null && recipientSettings.mutedTags.Intersect(senderSettings.myTags).Any())
                             continue;
                     }
                     SendToClient(recipient, message.data, Channel.Unreliable);
@@ -178,9 +178,15 @@ namespace Adrenak.UniVoice.Networks
                 var mutedPeers = reader.ReadIntArray().ToList();
                 var deafenAll = reader.ReadInt() == 1;
                 var deafenedPeers = reader.ReadIntArray().ToList();
-                var myTags = reader.ReadString().Split(",").ToList();
-                var mutedTags = reader.ReadString().Split(",").ToList();
-                var deafenedTags = reader.ReadString().Split(",").ToList();
+                
+                var myTagsVal = reader.ReadString();
+                var myTags = myTagsVal.Equals(",") ? new List<string>() : myTagsVal.Split(",").ToList();
+                
+                var mutedTagsVal = reader.ReadString();
+                var mutedTags = mutedTagsVal.Equals(",") ? new List<string>() : mutedTagsVal.Split(",").ToList();
+                
+                var deafenedTagsVal = reader.ReadString();
+                var deafenedTags = deafenedTagsVal.Equals(",") ? new List<string>() : deafenedTagsVal.Split(",").ToList();
 
                 var voiceSettings = new VoiceSettings {
                     muteAll = muteAll,

package/Runtime/Impl/Networks/Mirror/MirrorClient.cs

@@ -57,7 +57,7 @@ namespace Adrenak.UniVoice.Networks {
                 // If it was a Host that's now a ServerOnly, we still need the handler as it's used in MirrorServer
                 if (clientOnlyToOffline)
                     NetworkClient.UnregisterHandler<MirrorMessage>();
-                
+
                 OnClientDisconnected();
             }
         }
@@ -171,9 +171,15 @@ namespace Adrenak.UniVoice.Networks {
             writer.WriteIntArray(YourVoiceSettings.mutedPeers.ToArray());
             writer.WriteInt(YourVoiceSettings.deafenAll ? 1 : 0);
             writer.WriteIntArray(YourVoiceSettings.deafenedPeers.ToArray());
-            writer.WriteString(string.Join(",", YourVoiceSettings.myTags));
-            writer.WriteString(string.Join(",", YourVoiceSettings.mutedTags));
-            writer.WriteString(string.Join(",", YourVoiceSettings.deafenedTags));
+
+            var myTags = YourVoiceSettings.myTags;
+            writer.WriteString(myTags.Count == 0 ? "," : string.Join(",", myTags));
+            
+            var mutedTags = YourVoiceSettings.mutedTags;
+            writer.WriteString(mutedTags.Count == 0 ? "," : string.Join(",", mutedTags));
+
+            var deafenedTags = YourVoiceSettings.deafenedTags;
+            writer.WriteString(deafenedTags.Count == 0 ? "," : string.Join(",", deafenedTags));
 
             var message = new MirrorMessage {
                 data = writer.Bytes

package/Runtime/Impl/Networks/Mirror/MirrorServer.cs

@@ -45,7 +45,7 @@ namespace Adrenak.UniVoice.Networks {
 
             NetworkServer.RegisterHandler<MirrorMessage>(OnReceivedMessage, false);
         }
-        
+
         public void Dispose() {
             mirrorEvents.ModeChanged -= OnModeChanged;
             NetworkServer.UnregisterHandler<MirrorMessage>();
@@ -80,20 +80,20 @@ namespace Adrenak.UniVoice.Networks {
 
             // If in Host mode, the server and internal client have both started and the client connects immediately.
             // The host client seems to have ID 0 always, so we trigger a new client connection using id 0.
-            if(newMode == NetworkManagerMode.Host) {
+            if (newMode == NetworkManagerMode.Host) {
                 OnServerStarted();
                 OnServerConnected(0, "localhost");
             }
-            else if(newMode == NetworkManagerMode.ServerOnly) {
+            else if (newMode == NetworkManagerMode.ServerOnly) {
                 // If a Host changes to ServerOnly, we disconnect the internal client
                 if (oldMode == NetworkManagerMode.Host)
                     OnServerDisconnected(0);
                 // But if this machine is going from Offline to ServerOnly, only the server is starting
-                else if(oldMode == NetworkManagerMode.Offline)
+                else if (oldMode == NetworkManagerMode.Offline)
                     OnServerStarted();
             }
             // If a Host or ServerOnly goes offline 
-            else if(newMode == NetworkManagerMode.Offline && (oldMode == NetworkManagerMode.ServerOnly || oldMode == NetworkManagerMode.Host)) {
+            else if (newMode == NetworkManagerMode.Offline && (oldMode == NetworkManagerMode.ServerOnly || oldMode == NetworkManagerMode.Host)) {
                 // We check if it was a Host before and disconnect the internal client
                 if (oldMode == NetworkManagerMode.Host)
                     OnServerDisconnected(0);
@@ -157,24 +157,29 @@ namespace Adrenak.UniVoice.Networks {
                             continue;
 
                         // If the peer has muted the sender using tag, skip sending audio
-                        if (recipientSettings.mutedTags.Intersect(senderSettings.myTags).Count() > 0)
+                        if (senderSettings != null && recipientSettings.mutedTags.Intersect(senderSettings.myTags).Count() > 0)
                             continue;
                     }
                     SendToClient(recipient, message.data, Channels.Unreliable);
                 }
             }
             else if (tag.Equals(MirrorMessageTags.VOICE_SETTINGS)) {
-                //Debug.unityLogger.Log(LogType.Log, TAG, "Mirror server stopped");
                 // We create the VoiceSettings object by reading from the reader
                 // and update the peer voice settings map
                 var muteAll = reader.ReadInt() == 1 ? true : false;
                 var mutedPeers = reader.ReadIntArray().ToList();
                 var deafenAll = reader.ReadInt() == 1 ? true : false;
                 var deafenedPeers = reader.ReadIntArray().ToList();
-                var myTags = reader.ReadString().Split(",").ToList();
-                var mutedTags = reader.ReadString().Split(",").ToList();
-                var deafenedTags = reader.ReadString().Split(",").ToList();
 
+                var myTagsVal = reader.ReadString();
+                var myTags = myTagsVal.Equals(",") ? new List<string>() : myTagsVal.Split(",").ToList();
+                
+                var mutedTagsVal = reader.ReadString();
+                var mutedTags = mutedTagsVal.Equals(",") ? new List<string>() : mutedTagsVal.Split(",").ToList();
+                
+                var deafenedTagsVal = reader.ReadString();
+                var deafenedTags = deafenedTagsVal.Equals(",") ? new List<string>() : deafenedTagsVal.Split(",").ToList();
+                
                 var voiceSettings = new VoiceSettings {
                     muteAll = muteAll,
                     mutedPeers = mutedPeers,
@@ -278,7 +283,7 @@ namespace Adrenak.UniVoice.Networks {
         }
 
         NetworkConnectionToClient GetConnectionToClient(int connId) {
-            foreach(var conn in NetworkServer.connections) 
+            foreach (var conn in NetworkServer.connections)
                 if (conn.Key == connId)
                     return conn.Value;
             return null;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.adrenak.univoice",
-    "version": "4.10.3",
+    "version": "4.10.5",
     "displayName": "Adrenak.UniVoice",
     "description": "Voice chat/VoIP framework for Unity.",
     "unity": "2021.2",