From d0d3d5bd78139fe31247638e3fbc7e99fddc39b9 Mon Sep 17 00:00:00 2001
From: Mikhail <99481254+DCFApixels@users.noreply.github.com>
Date: Sun, 10 Mar 2024 10:29:58 +0800
Subject: [PATCH] Update EcsEntityConnect.cs

---
 src/Connectors/EcsEntityConnect.cs | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/Connectors/EcsEntityConnect.cs b/src/Connectors/EcsEntityConnect.cs
index b7d2a02..9d78132 100644
--- a/src/Connectors/EcsEntityConnect.cs
+++ b/src/Connectors/EcsEntityConnect.cs
@@ -53,15 +53,6 @@ namespace DCFApixels.DragonECS
     [DisallowMultipleComponent]
     public class EcsEntityConnect : MonoBehaviour
     {
-        private sealed class Aspect : EcsAspect
-        {
-            public EcsPool<UnityGameObjectConnect> unityGameObjects;
-            protected override void Init(Builder b)
-            {
-                unityGameObjects = b.Include<UnityGameObjectConnect>();
-            }
-        }
-
         private entlong _entity;
         private EcsWorld _world;
 
@@ -109,17 +100,17 @@ namespace DCFApixels.DragonECS
             {
                 _entity = entity;
                 _world = world;
-                var a = _world.GetAspect<Aspect>();
-                if (a.unityGameObjects.Has(newEntityID))
+                var unityGameObjects = _world.GetPool<UnityGameObjectConnect>();
+                if (unityGameObjects.Has(newEntityID))
                 {
-                    ref readonly var uconnect = ref a.unityGameObjects.Read(newEntityID);
+                    ref readonly var uconnect = ref unityGameObjects.Read(newEntityID);
                     if (uconnect.IsConnected)
                     {
                         uconnect.connect.Disconnect();
                     }
                 }
 
-                a.unityGameObjects.TryAddOrGet(newEntityID) = new UnityGameObjectConnect(this);
+                unityGameObjects.TryAddOrGet(newEntityID) = new UnityGameObjectConnect(this);
                 if (applyTemplates)
                 {
                     ApplyTemplatesFor(world.id, newEntityID);
@@ -134,8 +125,8 @@ namespace DCFApixels.DragonECS
         {
             if (_entity.TryGetID(out int oldEntityID) && _world != null)
             {
-                var a = _world.GetAspect<Aspect>();
-                a.unityGameObjects.TryDel(oldEntityID);
+                var unityGameObjects = _world.GetPool<UnityGameObjectConnect>();
+                unityGameObjects.TryDel(oldEntityID);
             }
             _world = null;
         }