From 509bbd70f0dd34152f03c7cb645a92ae535a4954 Mon Sep 17 00:00:00 2001 From: Tom Burrows Date: Sat, 19 Oct 2024 04:09:31 +0100 Subject: [PATCH] Fix crash - don't deduplicate search in blocking mode --- scripts/search.lua | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/scripts/search.lua b/scripts/search.lua index 5d9d195..79bde61 100644 --- a/scripts/search.lua +++ b/scripts/search.lua @@ -627,20 +627,18 @@ function Search.blocking_search(force, state, target_item, surface_list, type_li force = { force, "neutral" }, } for _, entity in pairs(entities) do - if math2d.bounding_box.contains_point(chunk_area, entity.position) then - if entity.type == "resource" then - local amount - if entity.initial_amount then - amount = entity.amount / 3000 -- Calculate yield from amount - else - amount = entity.amount - end - SearchResults.add_entity_resource(entity, surface_data.entities, amount) - SearchResults.add_surface_info("resource_count", amount, surface_data.surface_info) + if entity.type == "resource" then + local amount + if entity.initial_amount then + amount = entity.amount / 3000 -- Calculate yield from amount else - SearchResults.add_entity(entity, surface_data.entities) - SearchResults.add_surface_info("entity_count", 1, surface_data.surface_info) + amount = entity.amount end + SearchResults.add_entity_resource(entity, surface_data.entities, amount) + SearchResults.add_surface_info("resource_count", amount, surface_data.surface_info) + else + SearchResults.add_entity(entity, surface_data.entities) + SearchResults.add_surface_info("entity_count", 1, surface_data.surface_info) end end end