Merge pull request #552 from FabianTerhorst/dev

RC
FabianTerhorst · May 11, 2022 · 5cc53f7 · 5cc53f7
2 parents 886e00a + 3fa1e03
commit 5cc53f7
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/api/AltV.Net.Async/AsyncBaseObjectPool.cs b/api/AltV.Net.Async/AsyncBaseObjectPool.cs
@@ -22,9 +22,11 @@ protected AsyncBaseObjectPool(IBaseObjectFactory<TBaseObject> entityFactory)
 
         public TBaseObject Create(ICore core, IntPtr entityPointer)
         {
-            var entity = entityFactory.Create(core, entityPointer);
-            Add(entity);
-            return entity;
+            if (entityPointer == IntPtr.Zero) return default;
+            if (entities.TryGetValue(entityPointer, out var baseObject)) return baseObject;
+            baseObject = entityFactory.Create(core, entityPointer);
+            Add(baseObject);
+            return baseObject;
         }
 
         public void Add(TBaseObject entity)
@@ -66,9 +68,7 @@ public TBaseObject GetOrCreate(ICore core, IntPtr entityPointer)
 
             if (entities.TryGetValue(entityPointer, out var entity)) return entity;
 
-            entity = Create(core, entityPointer);
-
-            return entity;
+            return Create(core, entityPointer);
         }
 
         public IReadOnlyCollection<TBaseObject> GetAllObjects()