Improve dimension update for networking entity

Author: FabianTerhorst

api/AltV.Net.NetworkingEntity/ClientEntityStreamingHandler.cs

@@ -17,14 +17,15 @@ namespace AltV.Net.NetworkingEntity
     public class ClientEntityStreamingHandler : IStreamingHandler
     {
         private readonly INetworkingClientPool networkingClientPool;
-        
+
         private readonly IAuthenticationProvider authenticationProvider;
 
         public event Action<INetworkingEntity, INetworkingClient> EntityStreamInHandler;
 
         public event Action<INetworkingEntity, INetworkingClient> EntityStreamOutHandler;
 
-        public ClientEntityStreamingHandler(INetworkingClientPool networkingClientPool, IAuthenticationProvider authenticationProvider)
+        public ClientEntityStreamingHandler(INetworkingClientPool networkingClientPool,
+            IAuthenticationProvider authenticationProvider)
         {
             this.networkingClientPool = networkingClientPool;
             this.authenticationProvider = authenticationProvider;
@@ -43,12 +44,15 @@ public void OnMessage(ManagedWebSocket managedWebSocket, WebSocketReceiveResult
                 {
                     var token = authEvent.Token;
                     if (token == null) return;
-                    var verified = await authenticationProvider.Verify(networkingClientPool, managedWebSocket, token, out var client);
+                    var verified = await authenticationProvider.Verify(networkingClientPool, managedWebSocket, token,
+                        out var client);
                     if (!verified)
                     {
                         return;
                     }
 
+                    client.OnConnect();
+
                     var sendEvent = new ServerEvent();
                     var currSendEvent = new EntitySendEvent();
                     lock (AltNetworking.Module.EntityPool.Entities)

api/AltV.Net.NetworkingEntity/Elements/Entities/INetworkingClient.cs

@@ -13,5 +13,7 @@ public interface INetworkingClient
         ManagedWebSocket WebSocket { get; set; }
 
         int Dimension { get; set; }
+
+        void OnConnect();
     }
 }

api/AltV.Net.NetworkingEntity/Elements/Entities/INetworkingEntity.cs

@@ -41,6 +41,11 @@ public interface INetworkingEntity
         /// </summary>
         StreamingType StreamingType { get; }
 
+        /// <summary>
+        /// The main entity streamer, not in use currently
+        /// </summary>
+        INetworkingClient MainStreamer { get; }
+        
 
         /// <summary>
         /// This method is required to call to change entity data after creation to update data snapshot

api/AltV.Net.NetworkingEntity/Elements/Entities/NetworkingClient.cs

@@ -19,12 +19,21 @@ public class NetworkingClient : INetworkingClient, IInternalNetworkingClient
 
         public int Dimension
         {
-            get => dimension;
+            get
+            {
+                lock (this)
+                {
+                    return dimension;
+                }
+            }
             set
             {
-                if (dimension == value) return;
-                entityStreamer.UpdateClientDimension(this, value);
-                dimension = value;
+                lock (this)
+                {
+                    if (dimension == value) return;
+                    entityStreamer.UpdateClientDimension(this, value);
+                    dimension = value;
+                }
             }
         }
 
@@ -34,5 +43,16 @@ public NetworkingClient(string token, IEntityStreamer entityStreamer)
             Exists = true;
             this.entityStreamer = entityStreamer;
         }
+
+        public void OnConnect()
+        {
+            lock (this)
+            {
+                if (dimension != 0)
+                {
+                    entityStreamer.UpdateClientDimension(this, dimension);
+                }
+            }
+        }
     }
 }

api/AltV.Net.NetworkingEntity/Elements/Entities/NetworkingEntity.cs

@@ -10,7 +10,8 @@ public class NetworkingEntity : INetworkingEntity, IInternalNetworkingEntity
         private readonly IEntityStreamer entityStreamer;
 
         public EntityDataSnapshot Snapshot { get; }
-
+        
+        public INetworkingClient MainStreamer { get; }
 
         public StreamingType StreamingType { get; }
 

api/AltV.Net/FunctionParser/FunctionTypeInfo.cs

@@ -40,7 +40,7 @@ internal class FunctionTypeInfo
         public FunctionTypeInfo(Type type)
         {
             IsList = type.BaseType == FunctionTypes.Array;
-            IsDict = type.Name.StartsWith("Dictionary");
+            IsDict = type.Name.StartsWith("Dictionary") || type.Name.StartsWith("IDictionary");
             if (IsDict)
             {
                 GenericArguments = type.GetGenericArguments();