1

Src/Core/ECS/Entity.cs

@@ -8,22 +8,6 @@ namespace BITKit.Entities
 {
     public class Entity : IEntity, IDisposable
     {
-        private class EntityServiceProvider : IServiceProvider
-        {
-            public ServiceProvider ServiceProvider;
-            public readonly List<Object> Services = new();
-            public object GetService(Type serviceType)
-            {
-                var value = ServiceProvider.GetService(serviceType);
-                if (value != null)
-                {
-                    Services.TryAdd(value);
-                }
- 
-                return value;
-            }
-        }
-
         public Entity()
         {
             ServiceCollection.AddSingleton<IEntity>(this);
@@ -36,26 +20,12 @@ namespace BITKit.Entities
         public CancellationToken CancellationToken => _cancellationTokenSource.Token;
         private readonly CancellationTokenSource _cancellationTokenSource = new();
 
-        public IServiceProvider ServiceProvider
-        {
-            get
-            {
-                if (_serviceProvider is not null)
-                {
-                    return _serviceProvider;
-                }
-
-                var value = new EntityServiceProvider()
-                {
-                    ServiceProvider = ServiceCollection.BuildServiceProvider()
-                };
-                _serviceProvider = value;
-                return _serviceProvider;
-            }
-        }
+        public IServiceProvider ServiceProvider => _serviceProvider ??= ServiceCollection.BuildServiceProvider();
+        private ServiceProvider _serviceProvider;
         public IServiceCollection ServiceCollection { get; } = new ServiceCollection();
-        private EntityServiceProvider _serviceProvider;
-        public object[] GetServices()=> _serviceProvider.Services.ToArray();
+
+        public object[] GetServices() => ServiceCollection.ToArray()
+            .Select(x => _serviceProvider.GetService(x.ServiceType)).ToArray();
         public void Inject(object obj)
         {
             foreach (var fieldInfo in obj.GetType().GetFields(ReflectionHelper.Flags))
@@ -70,11 +40,7 @@ namespace BITKit.Entities
         public void Dispose()
         {
             _cancellationTokenSource.Cancel();
-            _serviceProvider.ServiceProvider.Dispose();
-            foreach (var x in GetServices().OfType<IDisposable>())
-            {
-                x.Dispose();
-            }
+            _serviceProvider.Dispose();
         }
     }
 }