Skip to content

Commit 0071683

Browse files
committed
Fix other crash when searching for fluids
1 parent a06c25e commit 0071683

1 file changed

Lines changed: 12 additions & 2 deletions

File tree

scripts/search.lua

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,12 @@ function Search.process_found_entities(entities, state, surface_data, surface_st
261261

262262
if control_behavior.circuit_read_contents then
263263
-- TODO support "Include in crafting" and "Include fuel"
264-
local signal_count = entity.get_item_count(target_item_filter)
264+
local signal_count = 0
265+
if target_is_item then
266+
signal_count = entity.get_item_count(target_item_filter)
267+
elseif target_is_fluid then
268+
signal_count = entity.get_fluid_count(target_name)
269+
end
265270
if signal_count > 0 then
266271
SearchResults.add_entity(entity, surface_data.signals)
267272
SearchResults.add_surface_statistics("signal_count", 1, surface_statistics)
@@ -271,7 +276,12 @@ function Search.process_found_entities(entities, state, surface_data, surface_st
271276
if control_behavior.circuit_read_ingredients then
272277
local inventory = entity.get_inventory(defines.inventory.assembling_machine_input)
273278
if inventory then
274-
local signal_count = get_item_count(inventory, target_item_and_quality)
279+
local signal_count = 0
280+
if target_is_item then
281+
signal_count = get_item_count(inventory, target_item_and_quality)
282+
elseif target_is_fluid then
283+
signal_count = entity.get_fluid_count(target_name) -- Not strictly speaking accurate since checks entire entity, not just input inventory
284+
end
275285
if signal_count > 0 and not added_signals[target_type..'/'..target_name] then
276286
SearchResults.add_entity(entity, surface_data.signals)
277287
SearchResults.add_surface_statistics("signal_count", 1, surface_statistics)

0 commit comments

Comments
 (0)