#1367 Fix issue with batched OnAdd and OnRemove observers

SanderMertens · Sep 21, 2024 · b92cf06 · b92cf06
1 parent 3095237
commit b92cf06
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 6 deletions.
diff --git a/distr/flecs.c b/distr/flecs.c
@@ -10006,13 +10006,13 @@ void flecs_cmd_batch_for_entity(
         } while ((cur = next_for_entity));
     }
 
-    if (added.count) {
+    if (added.count && r->table) {
         ecs_table_diff_t add_diff = ECS_TABLE_DIFF_INIT;
         add_diff.added = added;
         add_diff.added_flags = diff->added_flags;
 
         flecs_defer_begin(world, world->stages[0]);
-        flecs_notify_on_add(world, table, start_table, 
+        flecs_notify_on_add(world, r->table, start_table,
             ECS_RECORD_TO_ROW(r->row), 1, &add_diff, 0, set_mask, true, false);
         flecs_defer_end(world, world->stages[0]);
         if (r->row & EcsEntityIsTraversable) {

diff --git a/src/entity.c b/src/entity.c
@@ -5018,13 +5018,13 @@ void flecs_cmd_batch_for_entity(
         } while ((cur = next_for_entity));
     }
 
-    if (added.count) {
+    if (added.count && r->table) {
         ecs_table_diff_t add_diff = ECS_TABLE_DIFF_INIT;
         add_diff.added = added;
         add_diff.added_flags = diff->added_flags;
 
         flecs_defer_begin(world, world->stages[0]);
-        flecs_notify_on_add(world, table, start_table, 
+        flecs_notify_on_add(world, r->table, start_table,
             ECS_RECORD_TO_ROW(r->row), 1, &add_diff, 0, set_mask, true, false);
         flecs_defer_end(world, world->stages[0]);
         if (r->row & EcsEntityIsTraversable) {

diff --git a/test/core/project.json b/test/core/project.json
@@ -2172,7 +2172,8 @@
                 "add_isa_set_w_override_batched",
                 "add_set_isa_w_override_batched",
                 "add_batched_set_with",
-                "defer_emplace_after_remove"
+                "defer_emplace_after_remove",
+                "batched_w_table_change_in_observer"
             ]
         }, {
             "id": "SingleThreadStaging",

diff --git a/test/core/src/Commands.c b/test/core/src/Commands.c
@@ -4149,3 +4149,44 @@ void Commands_defer_emplace_after_remove(void) {
 
     ecs_fini(world);
 }
+
+static
+void RemoveVelocity(ecs_iter_t *it) {
+    test_int(it->count, 1);
+    ecs_remove(it->world, it->entities[0], Velocity);
+}
+
+void Commands_batched_w_table_change_in_observer(void) {
+    ecs_world_t *world = ecs_mini();
+
+    ECS_COMPONENT_DEFINE(world, Position);
+    ECS_COMPONENT_DEFINE(world, Velocity);
+    ECS_TAG(world, Foo);
+
+    ecs_observer(world, {
+        .query.terms = {{ ecs_id(Position) }},
+        .events = { EcsOnRemove },
+        .callback = RemoveVelocity
+    });
+
+    ecs_observer(world, {
+        .query.terms = {{ Foo }},
+        .events = { EcsOnAdd },
+        .callback = DummyObserver
+    });
+
+    ecs_entity_t e1 = ecs_new(world);
+    ecs_add(world, e1, Position);
+    ecs_add(world, e1, Velocity);
+
+    ecs_defer_begin(world);
+    ecs_remove(world, e1, Position);
+    ecs_add(world, e1, Foo);
+    ecs_defer_end(world);
+
+    test_assert(ecs_has(world, e1, Foo));
+    test_assert(!ecs_has(world, e1, Position));
+    test_assert(!ecs_has(world, e1, Velocity));
+
+    ecs_fini(world);
+}
diff --git a/test/core/src/main.c b/test/core/src/main.c
@@ -2092,6 +2092,7 @@ void Commands_add_isa_set_w_override_batched(void);
 void Commands_add_set_isa_w_override_batched(void);
 void Commands_add_batched_set_with(void);
 void Commands_defer_emplace_after_remove(void);
+void Commands_batched_w_table_change_in_observer(void);
 
 // Testsuite 'SingleThreadStaging'
 void SingleThreadStaging_setup(void);
@@ -10349,6 +10350,10 @@ bake_test_case Commands_testcases[] = {
     {
         "defer_emplace_after_remove",
         Commands_defer_emplace_after_remove
+    },
+    {
+        "batched_w_table_change_in_observer",
+        Commands_batched_w_table_change_in_observer
     }
 };
 
@@ -11205,7 +11210,7 @@ static bake_test_suite suites[] = {
         "Commands",
         NULL,
         NULL,
-        139,
+        140,
         Commands_testcases
     },
     {