Merge 870823f9fc into 263544d77c

jecs.luau

@@ -1154,8 +1154,6 @@ do
 			for archetype_id in idr_t.columns do
 				local idr_t_archetype = archetypes[archetype_id]
 				local idr_t_types = idr_t_archetype.types
-				local to = idr_t_archetype
-
 				local children = table.clone(idr_t_archetype.entities)
 				local n = #children
 
@@ -1165,30 +1163,28 @@ do
 					end
 
 					local object = ecs_pair_second(world, id)
-					if object ~= delete then
+					if object == delete then
-						continue
+						local id_record = component_index[id]
-					end
+						local flags = id_record.flags
-
+						local flags_delete_mask: number = bit32.band(flags, ECS_ID_DELETE)
-					local id_record = component_index[id]
+						if flags_delete_mask ~= 0 then
-					local flags = id_record.flags
+							for i = n, 1, -1 do
-					local flags_delete_mask: number = bit32.band(flags, ECS_ID_DELETE)
+								world_delete(world, children[i])
-					if flags_delete_mask ~= 0 then
-						for i = n, 1, -1 do
-							world_delete(world, children[i])
-						end
-						break
-					else
-						local on_remove = id_record.hooks.on_remove
-						to = archetype_traverse_remove(world, id, to)
-						local empty = #to.types == 0
-						for i = n, 1, -1 do
-							local child = children[i]
-							if on_remove then
-								on_remove(child)
 							end
-							if not empty then
+							break
-								local r = sparse_array[ECS_ENTITY_T_LO(child)]
+						else
-								entity_move(entity_index, child, r, to)
+							local on_remove = id_record.hooks.on_remove
+							local to = archetype_traverse_remove(world, id, idr_t_archetype)
+							local empty = #to.types == 0
+							for i = n, 1, -1 do
+								local child = children[i]
+								if on_remove then
+									on_remove(child)
+								end
+								if not empty then
+									local r = sparse_array[ECS_ENTITY_T_LO(child)]
+									entity_move(entity_index, child, r, to)
+								end
 							end
 						end
 					end

test/tests.luau

@@ -1333,26 +1333,6 @@ TEST("world:target", function()
 
 		CHECK(i == 10)
 	end
-
-	do CASE("should return correct targets after deletion") -- ISSUE #207
-		local world = jecs.World.new()
-
-		local Attacks = world:component()
-		local Eats = world:component()
-		local a = world:entity()
-		local b = world:entity()
-		local c = world:entity()
-
-		world:add(a, jecs.pair(Attacks, b))
-		world:add(a, jecs.pair(Attacks, c))
-		world:add(a, jecs.pair(Eats, c))
-		world:add(a, jecs.pair(Eats, b))
-		world:delete(c)
-
-		CHECK(world:target(a, Attacks, 0) == b)
-		CHECK(not world:target(a, Attacks, 1))
-		CHECK(not world:target(a, Attacks, 2))
-	end
 end)
 
 TEST("world:contains", function()