Skip to content

Commit

Permalink
Merge branch 'dev2.0' of https://github.com/modded-factorio/bobsmods
Browse files Browse the repository at this point in the history
…into dev2.0
  • Loading branch information
KiwiHawk committed Oct 23, 2024
2 parents 9fd26ab + 479cae0 commit bb83099
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion bobinserters/control.lua
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,8 @@ script.on_event(defines.events.on_built_entity, function(event)
entity_name = entity.ghost_name
end

if (entity.type == "inserter" or (entity.type == "entity-ghost" and entity.ghost_type == "inserter"))
if
(entity.type == "inserter" or (entity.type == "entity-ghost" and entity.ghost_type == "inserter"))
and not storage.bobmods.inserters.blacklist[entity_name]
then
bobmods.logistics.set_positions(entity, event.player_index)
Expand Down
3 changes: 2 additions & 1 deletion boblogistics/control.lua
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,8 @@ script.on_event(defines.events.on_built_entity, function(event)
entity_name = entity.ghost_name
end

if not game.active_mods["bobinserters"]
if
not game.active_mods["bobinserters"]
and (entity.type == "inserter" or (entity.type == "entity-ghost" and entity.ghost_type == "inserter"))
and not storage.bobmods.logistics.blacklist[entity_name]
then
Expand Down

0 comments on commit bb83099

Please sign in to comment.