more fixes

Author: dooly123

Basis/Packages/com.basis.framework.editor/Editor/BasisEveryoneLoadNewAvatarLocalEditor.cs

@@ -40,7 +40,7 @@ private async void ForceLoadAvatars(byte loadmode, string password, string url)
 
         foreach (var players in BasisNetworkPlayers.RemotePlayers)
         {
-            await players.Value.RemotePlayer.CreateAvatar(loadmode, loadableBundle);
+            await players.Value.CreateAvatar(loadmode, loadableBundle);
         }
 
         Debug.Log("Avatar load initiated for all remote players.");

Basis/Packages/com.basis.framework/BasisUI/Menus/Main Menu Providers/SettingsProviderParts/SettingsProviderRemoteAudio.cs

@@ -48,7 +48,7 @@ private static void ApplyJitterBufferDepth()
             _lastAppliedJitterDepth = depth;
             if (firstApply) return; // startup — no live receivers to poke
 
-            foreach (var kvp in BasisNetworkPlayers.RemotePlayers)
+            foreach (var kvp in BasisNetworkPlayers.RemotePlayerReceivers)
             {
                 BasisNetworkReceiver receiver = kvp.Value;
                 if (receiver?.AudioReceiverModule?.VoiceBuffer != null)
@@ -70,7 +70,7 @@ private static void ApplyClipBufferScalar()
             BasisAudioClipPool.ClipBufferScalar = scalar;
             BasisAudioClipPool.Clear();
 
-            foreach (var kvp in BasisNetworkPlayers.RemotePlayers)
+            foreach (var kvp in BasisNetworkPlayers.RemotePlayerReceivers)
             {
                 BasisNetworkReceiver receiver = kvp.Value;
                 if (receiver?.AudioReceiverModule != null && receiver.AudioReceiverModule.HasAudioSource)
@@ -612,7 +612,7 @@ public static void ResetRemoteAudioToDefaults()
         /// </summary>
         public static void ApplyRemoteAudioToAll()
         {
-            foreach (var kvp in BasisNetworkPlayers.RemotePlayers)
+            foreach (var kvp in BasisNetworkPlayers.RemotePlayerReceivers)
             {
                 BasisNetworkReceiver receiver = kvp.Value;
                 if (receiver?.AudioReceiverModule != null && receiver.AudioReceiverModule.HasAudioSource)

Basis/Packages/com.basis.framework/Networking/BasisNetworkPlayers.cs

@@ -16,7 +16,8 @@ public static class BasisNetworkPlayers
     {
         // --- Collections (thread-safe) -------------------------------------
         public static readonly ConcurrentDictionary<ushort, BasisNetworkPlayer> Players = new();
-        public static readonly ConcurrentDictionary<ushort, BasisNetworkReceiver> RemotePlayers = new();
+        public static readonly ConcurrentDictionary<ushort, BasisNetworkReceiver> RemotePlayerReceivers = new();
+        public static readonly ConcurrentDictionary<ushort, BasisRemotePlayer> RemotePlayers = new();
         public static readonly ConcurrentDictionary<ushort, byte> JoiningPlayers = new(); // used as a concurrent set
         public static readonly ConcurrentDictionary<string, ushort> OwnershipPairing = new();
 
@@ -39,6 +40,7 @@ public static void ClearAllRegistries()
                 BasisNetworkHandleRemoval.HandleDisconnectIdImmediate(BasisNetworkPlayer.Key);
             }
             Players.Clear();
+            RemotePlayerReceivers.Clear();
             RemotePlayers.Clear();
             JoiningPlayers.Clear();
             OwnershipPairing.Clear();
@@ -54,7 +56,7 @@ public static void PublishReceiversSnapshot()
         {
             if (!_snapshotDirty) return;
 
-            int count = RemotePlayers.Count;
+            int count = RemotePlayerReceivers.Count;
             if (count == 0)
             {
                 // Null out stale references so GC can collect departed receivers
@@ -77,7 +79,7 @@ public static void PublishReceiversSnapshot()
 
             // Enumerate directly (struct enumerator) — no Values/ToArray allocation
             int i = 0;
-            foreach (var kvp in RemotePlayers)
+            foreach (var kvp in RemotePlayerReceivers)
             {
                 if (i >= _snapshotBuffer.Length) break;
                 _snapshotBuffer[i++] = kvp.Value;
@@ -124,18 +126,19 @@ public static bool AddPlayer(BasisNetworkPlayer netPlayer)
 
             if (!netPlayer.Player.IsLocal)
             {
-                if (RemotePlayers.ContainsKey(netPlayer.playerId))
+                if (RemotePlayerReceivers.ContainsKey(netPlayer.playerId))
                 {
                     BasisDebug.LogWarning($"Remote player {netPlayer.playerId} already exists. Removing old entry before adding new one.");
                     BasisNetworkHandleRemoval.HandleDisconnectIdImmediate(netPlayer.playerId);
                 }
 
-                if (!RemotePlayers.TryAdd(netPlayer.playerId, (BasisNetworkReceiver)netPlayer))
+                if (!RemotePlayerReceivers.TryAdd(netPlayer.playerId, (BasisNetworkReceiver)netPlayer))
                 {
                     Players.TryRemove(netPlayer.playerId, out _);
                     BasisDebug.LogError($"Failed to add remote player {netPlayer.playerId} to RemotePlayers. Rolled back from Players.");
                     return false;
                 }
+                RemotePlayers[netPlayer.playerId] = (BasisRemotePlayer)netPlayer.Player;
                 _snapshotDirty = true;
             }
 
@@ -152,6 +155,7 @@ public static bool RemovePlayer(ushort netId, out BasisNetworkPlayer player)
             }
 
             Players.TryRemove(netId, out player);
+            RemotePlayerReceivers.TryRemove(netId, out _);
             RemotePlayers.TryRemove(netId, out _);
             _snapshotDirty = true;
             return true;

Basis/Packages/com.basis.framework/Networking/Handles/BasisNetworkHandleAvatar.cs

@@ -22,7 +22,7 @@ public static void HandleAvatarUpdate(NetDataReader reader, byte channel)
 
         ushort playerId = ssm.playerIdMessage.playerID;
 
-        if (BasisNetworkPlayers.RemotePlayers.TryGetValue(playerId, out BasisNetworkReceiver player))
+        if (BasisNetworkPlayers.RemotePlayerReceivers.TryGetValue(playerId, out BasisNetworkReceiver player))
         {
             BasisNetworkAvatarDecompressor.DecompressAndProcessAvatar(player, ssm);
         }

Basis/Packages/com.basis.framework/Networking/Handles/BasisNetworkHandleVoice.cs

@@ -27,7 +27,7 @@ public static async Task HandleAudioUpdate(NetPacketReader Reader, bool largeId)
                     audioUpdate = new ServerAudioSegmentMessage();
                 }
                 audioUpdate.Deserialize(Reader, largeId);
-                if (BasisNetworkPlayers.RemotePlayers.TryGetValue(audioUpdate.playerIdMessage.playerID, out BasisNetworkReceiver player))
+                if (BasisNetworkPlayers.RemotePlayerReceivers.TryGetValue(audioUpdate.playerIdMessage.playerID, out BasisNetworkReceiver player))
                 {
                     if (audioUpdate.audioSegmentData.LengthUsed == 0)
                     {

Basis/Packages/com.basis.framework/Networking/Object Sync/BasisSeatSync.cs

@@ -133,7 +133,7 @@ public void ProvideRemotePlayerTarget()
         }
 
         // Try to get the remote player by id.
-        if (!BasisNetworkPlayers.RemotePlayers.TryGetValue(storedId, out BasisNetworkReceiver rec))
+        if (!BasisNetworkPlayers.RemotePlayerReceivers.TryGetValue(storedId, out BasisNetworkReceiver rec))
         {
             // ID no longer exists in dictionary (disconnected / removed).
             ClearCurrentRemote();

Basis/Packages/com.basis.framework/Networking/Recievers/BasisShoutAudioDriver.cs

@@ -104,7 +104,7 @@ public static void EnableShoutMode(ushort playerId)
             entry.Receiver.HasAudioSource = true;
 
             // Wire up the player's existing viseme driver so lip-sync works during shout mode
-            if (BasisNetworkPlayers.RemotePlayers.TryGetValue(playerId, out BasisNetworkReceiver receiver))
+            if (BasisNetworkPlayers.RemotePlayerReceivers.TryGetValue(playerId, out BasisNetworkReceiver receiver))
             {
                 entry.Driver.Initialize(receiver.AudioReceiverModule.visemeDriver);
             }
@@ -190,7 +190,7 @@ public static void ReceiveShoutAudio(ushort playerId, AudioSegmentDataMessage au
             entry.Receiver.Insert(audioData);
 
             // Notify the player's nameplate that audio was received so it shows the talking state
-            if (BasisNetworkPlayers.RemotePlayers.TryGetValue(playerId, out BasisNetworkReceiver receiver))
+            if (BasisNetworkPlayers.RemotePlayerReceivers.TryGetValue(playerId, out BasisNetworkReceiver receiver))
             {
                 receiver.Player.AudioReceived?.Invoke();
             }

Basis/Packages/com.basis.framework/Players/Remote/BasisRemotePlayer.cs

@@ -257,6 +257,9 @@ public void SetSelfMuted(bool muted)
         [System.NonSerialized]
         public Basis.Scripts.Avatar.BasisAvatarPerformanceLimits.PerformanceInfo LastPerformanceInfo;
 
+        [System.NonSerialized]
+        public bool RequiresPerformanceReval;
+
         /// <summary>
         /// Per-player override that tells the avatar performance filter to treat this
         /// remote as if no limits were enabled. Set from the individual-player menu