ECS - set EntityData.Id for deleted entities

friflo · Aug 1, 2024 · 02e1c79 · 02e1c79
1 parent a0676f7
commit 02e1c79
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/ECS/Entity.cs b/src/ECS/Entity.cs
@@ -259,7 +259,7 @@ public     ref readonly Tags                Tags { get {
         if (node.archetype != null && Revision == node.revision) {
             return new EntityData(node, Id);
         }
-        return default;
+        return new EntityData(Id);
     } }  
 
     /// <summary>Returns the <see cref="ECS.EntityName"/> reference of an entity.</summary>

diff --git a/src/ECS/Entity/EntityData.cs b/src/ECS/Entity/EntityData.cs
@@ -85,5 +85,9 @@ internal EntityData(in EntityNode node, int id) {
         Id          = id;
         compIndex   = node.compIndex;
     }
+
+    internal EntityData(int id) {
+        Id = id;
+    }
     #endregion
 }
diff --git a/src/Tests/ECS/Entity/Test_EntityData.cs b/src/Tests/ECS/Entity/Test_EntityData.cs
@@ -54,7 +54,10 @@ public static void Test_EntityData_access()
         entity.DeleteEntity();
 
         data = entity.Data;
-        IsTrue(data.IsNull);
+        IsTrue  (           data.IsNull);
+        AreEqual(1,         data.Id);
+        AreEqual("Id: 1",   data.ToString());
+
         Throws<NullReferenceException>(() => {
             GetTags(entity);
         });