From ddbfd6c38344ee63d88da7e266df81f5fd485e90 Mon Sep 17 00:00:00 2001 From: Ukendio Date: Sun, 7 Jul 2024 00:18:23 +0200 Subject: [PATCH] merge conflicts --- benches/query.luau | 3 --- src/init.luau | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/benches/query.luau b/benches/query.luau index 7a9ad63..92b6c1c 100644 --- a/benches/query.luau +++ b/benches/query.luau @@ -7,10 +7,7 @@ local function TITLE(title: string) print() print(testkit.color.white(title)) end -<<<<<<< HEAD -======= ->>>>>>> b73d7e12b79401f3c52303d4ae01166b720c75b1 local jecs = require("@jecs") local mirror = require("../mirror/init") diff --git a/src/init.luau b/src/init.luau index 1eb7498..d666dcd 100644 --- a/src/init.luau +++ b/src/init.luau @@ -848,7 +848,7 @@ local function preparedQuery(compatibleArchetypes: { Archetype }, replace = replace } - return it + return setmetatable(it, it) :: any end local function query(world: World, ...: number): Query