wip

2022-12-17 21:16:02 +04:00
parent 13044357a5
commit ab85578ccf
9 changed files with 565 additions and 558 deletions
@@ -1,35 +1,34 @@
-namespace Ragon.Core.Game;
-
-public class EntityList
-{
-  private readonly List<Entity> _dynamicEntitiesList = new List<Entity>();
-  private readonly List<Entity> _staticEntitiesList = new List<Entity>();
-  private readonly Dictionary<ushort, Entity> _entitiesMap = new Dictionary<ushort, Entity>();
-
-  public IReadOnlyList<Entity> StaticList => _staticEntitiesList;
-  public IReadOnlyList<Entity> DynamicList => _dynamicEntitiesList;
-  public IReadOnlyDictionary<ushort, Entity> Map => _entitiesMap;
-
-  public void Add(Entity entity)
-  {
-    if (entity.StaticId != 0)
-      _staticEntitiesList.Add(entity);
-    else
-      _dynamicEntitiesList.Add(entity);
-    
-    _entitiesMap.Add(entity.Id, entity);
-  }
-
-  public Entity Remove(Entity entity)
-  {
-    if (_entitiesMap.Remove(entity.Id, out var existEntity))
-    {
-      _staticEntitiesList.Remove(entity);
-      _dynamicEntitiesList.Remove(entity);
-      
-      return existEntity;
-    }
-
-    return null;
-  }
+namespace Ragon.Core.Game;
+
+public class EntityList
+{
+  private readonly List<Entity> _dynamicEntitiesList = new List<Entity>();
+  private readonly List<Entity> _staticEntitiesList = new List<Entity>();
+  private readonly Dictionary<ushort, Entity> _entitiesMap = new Dictionary<ushort, Entity>();
+
+  public IReadOnlyList<Entity> StaticList => _staticEntitiesList;
+  public IReadOnlyList<Entity> DynamicList => _dynamicEntitiesList;
+  public IReadOnlyDictionary<ushort, Entity> Map => _entitiesMap;
+
+  public void Add(Entity entity)
+  {
+    if (entity.StaticId != 0)
+      _staticEntitiesList.Add(entity);
+    else
+      _dynamicEntitiesList.Add(entity);
+    
+    _entitiesMap.Add(entity.Id, entity);
+  }
+
+  public bool Remove(Entity entity)
+  {
+    if (_entitiesMap.Remove(entity.Id, out var existEntity))
+    {
+      _staticEntitiesList.Remove(entity);
+      _dynamicEntitiesList.Remove(entity);
+      
+      return true;
+    }
+    return false;
+  }
 }