update runtime submodule. apply feedback

altmp · Dec 26, 2024 · a84334e · a84334e
1 parent 67969a6
commit a84334e
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 71 deletions.
diff --git a/api/AltV.Net.Async/Elements/Entities/AsyncPlayer.cs b/api/AltV.Net.Async/Elements/Entities/AsyncPlayer.cs
@@ -136,8 +136,18 @@ public long DiscordId
                 }
             }
         }
-
-        public List<StreamedEntityDistance> StreamedEntityDistances => GetStreamedEntities();
+
+        public List<StreamedEntityDistance> StreamedEntities
+        {
+            get
+            {
+                lock (Player)
+                {
+                    if (!AsyncContext.CheckIfExistsOrCachedNullable(Player)) return default;
+                    return Player.StreamedEntities;
+                }
+            }
+        }
 
         public ushort Health
         {
@@ -956,24 +966,6 @@ public WeaponData[] GetWeapons()
             }
         }
 
-        public uint GetStreamedEntitiesCount()
-        {
-            lock (Player)
-            {
-                if (!AsyncContext.CheckIfExistsNullable(Player)) return default;
-                return Player.GetStreamedEntitiesCount();
-            }
-        }
-
-        public List<StreamedEntityDistance> GetStreamedEntities()
-        {
-            lock (Player)
-            {
-                if (!AsyncContext.CheckIfExistsNullable(Player)) return default;
-                return Player.GetStreamedEntities();
-            }
-        }
-
         public void ClearBloodDamage()
         {
             lock (Player)

diff --git a/api/AltV.Net/Elements/Entities/IPlayer.cs b/api/AltV.Net/Elements/Entities/IPlayer.cs
@@ -43,7 +43,7 @@ public interface IPlayer : ISharedPlayer, IEntity
 
         long DiscordId { get; }
 
-        List<StreamedEntityDistance> StreamedEntityDistances { get; }
+        List<StreamedEntityDistance> StreamedEntities { get; }
 
         /// <summary>
         /// Gets and Sets the players health
@@ -256,18 +256,6 @@ void SetDateTime(int day, int month, int year, int hour,
         /// <returns></returns>
         WeaponData[] GetWeapons();
 
-        /// <summary>
-        /// Returns the amount of streamed entities
-        /// </summary>
-        /// <returns></returns>
-        uint GetStreamedEntitiesCount();
-
-        /// <summary>
-        /// Returns a list of streamed entities
-        /// </summary>
-        /// <returns></returns>
-        List<StreamedEntityDistance> GetStreamedEntities();
-
         /// <summary>
         /// Clears the blood damage of the player
         /// </summary>

diff --git a/api/AltV.Net/Elements/Entities/Player.cs b/api/AltV.Net/Elements/Entities/Player.cs
@@ -579,7 +579,36 @@ public long DiscordId
             }
         }
 
-        public List<StreamedEntityDistance> StreamedEntityDistances => GetStreamedEntities();
+        public List<StreamedEntityDistance> StreamedEntities
+        {
+            get
+            {
+                unsafe
+                {
+                    CheckIfEntityExistsOrCached();
+
+                    var entitiesCount = Core.Library.Server.Player_GetStreamedEntitiesCount(PlayerNativePointer);
+
+                    var pointers = IntPtr.Zero;
+                    var distances = new ushort[entitiesCount];
+                    var types = new byte[entitiesCount];
+                    Core.Library.Server.Player_GetStreamedEntities(PlayerNativePointer, &pointers, types, distances, entitiesCount);
+
+                    var entityPtrArray = new IntPtr[entitiesCount];
+                    Marshal.Copy(pointers, entityPtrArray, 0, (int) entitiesCount);
+                    Core.Library.Shared.FreeVoidPointerArray(pointers);
+
+                    var streamedEntities = new List<StreamedEntityDistance>((int) entitiesCount);
+                    for (ulong i = 0; i < entitiesCount; i++)
+                    {
+                        var entity = (IEntity) Core.PoolManager.GetOrCreate(Core, entityPtrArray[i], (BaseObjectType) types[i]);
+                        streamedEntities.Add(new StreamedEntityDistance(entity, distances[i]));
+                    }
+
+                    return streamedEntities;
+                }
+            }
+        }
 
         public ushort Health
         {
@@ -1259,43 +1288,6 @@ public WeaponData[] GetWeapons()
             }
         }
 
-        public uint GetStreamedEntitiesCount()
-        {
-            unsafe
-            {
-                CheckIfEntityExists();
-                return Core.Library.Server.Player_GetStreamedEntitiesCount(PlayerNativePointer);
-            }
-        }
-
-        public List<StreamedEntityDistance> GetStreamedEntities()
-        {
-            unsafe
-            {
-                CheckIfEntityExists();
-
-                var entitiesCount = Core.Library.Server.Player_GetStreamedEntitiesCount(PlayerNativePointer);
-
-                var pointers = IntPtr.Zero;
-                var distances = new ushort[entitiesCount];
-                var types = new byte[entitiesCount];
-                Core.Library.Server.Player_GetStreamedEntities(PlayerNativePointer, &pointers, distances, types, entitiesCount);
-
-                var entityPtrArray = new IntPtr[entitiesCount];
-                Marshal.Copy(pointers, entityPtrArray, 0, (int) entitiesCount);
-                Core.Library.Shared.FreeVoidPointerArray(pointers);
-
-                var streamedEntities = new List<StreamedEntityDistance>((int) entitiesCount);
-                for (ulong i = 0; i < entitiesCount; i++)
-                {
-                    var entity = (IEntity) Core.PoolManager.GetOrCreate(Core, entityPtrArray[i], (BaseObjectType) types[i]);
-                    streamedEntities.Add(new StreamedEntityDistance(entity, distances[i]));
-                }
-
-                return streamedEntities;
-            }
-        }
-
         public void Kick(string reason)
         {
             unsafe