Update storage index on empty storage

evaera · Dec 24, 2023 · d65ac20 · d65ac20
1 parent 234d8d9
commit d65ac20
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/lib/query.lua b/lib/query.lua
@@ -33,15 +33,14 @@ end
 local function nextItem(query)
 	local world = query.world
 	local currentCompatibleArchetype = query.currentCompatibleArchetype
-	local storageIndex = query.storageIndex
 	local seenEntities = query.seenEntities
 	local compatibleArchetypes = query.compatibleArchetypes
 
 	local entityId, entityData
 
 	local storages = world._storages
 	repeat
-		local nextStorage = storages[storageIndex]
+		local nextStorage = storages[query.storageIndex]
 		local currently = nextStorage[currentCompatibleArchetype]
 		if currently then
 			entityId, entityData = next(currently, query.lastEntityId)
@@ -51,9 +50,9 @@ local function nextItem(query)
 			currentCompatibleArchetype = next(compatibleArchetypes, currentCompatibleArchetype)
 
 			if currentCompatibleArchetype == nil then
-				storageIndex += 1
+				query.storageIndex += 1
 
-				nextStorage = storages[storageIndex]
+				nextStorage = storages[query.storageIndex]
 
 				if nextStorage == nil or next(nextStorage) == nil then
 					return